diff --git a/makefile b/makefile
index 38477c9..dfc98a8 100644
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@ debugWindows: CipherDBG.exe
 #Keeping the old one for now, until I can test it to make sure it works
 #WindowsLibs: libCaesar.lib libPlayfair.lib libVigenere.lib libAtbash.lib
 #WINDOWSLIBS = -llibCaesar -llibPlayfair -llibVigenere -llibAtbash
-libsWindows: directory $(patsubst %, $(LIBDIR)/lib%.lib,$(CIPHERS))
+libsWindows: $(patsubst %, lib%.lib,$(CIPHERS))
 WINDOWSLIBS = $(patsubst %, -llib%,$(CIPHERS))
 
 
@@ -49,27 +49,30 @@ CiphersDBG: main.cpp testMain.hpp $(LIBFILES)
 
 #Windows
 #Building Libraries
-#libCaesar.lib: SourceFiles/Caesar.cpp directory
-#	g++ $(LIBFLAGS) -o lib/$@ SourceFiles/Caesar.cpp
+libCaesar.lib: SourceFiles/Caesar.cpp
+	g++ $(LIBFLAGS) -o $@ $<
 
-#libPlayfair.lib: SourceFiles/Playfair.cpp directory
-#	g++ -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Playfair.cpp
+libPlayfair.lib: SourceFiles/Playfair.cpp
+	g++ $(LIBFLAGS) -o $@ $<
 
-#libVigenere.lib: SourceFiles/Vigenere.cpp directory
-#	g++ -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Vigenere.cpp
+libVigenere.lib: SourceFiles/Vigenere.cpp
+	g++ $(LIBFLAGS) -o $@ $<
 
-#libAtbash.lib: SourceFiles/Atbash.cpp directory
-#	g++ -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Atbash.cpp
+libAtbash.lib: SourceFiles/Atbash.cpp
+	g++ $(LIBFLAGS) -o $@ $<
 
-$(LIBDIR)/lib%.lib: SourceFiles/%.cpp
+libAutokey.lib: SourceFiles/Autokey.cpp libVigenere.lib
+	g++ $(LIBFLAGS) -o $@ $< -L./ -llibVigenere
+
+libMorse.lib: SourceFiles/Morse.cpp
 	g++ $(LIBFLAGS) -o $@ $<
 
 #Building Executables
 CipherStream.exe: main.cpp helperFunctions.hpp
-	g++ $(EXEFLAGS) -o $@ main.cpp -L $(LIBDIR) $(WINDOWSLIBS)
+	g++ $(EXEFLAGS) -o $@ main.cpp -L./ $(WINDOWSLIBS)
 
 CiphersTest.exe: main.cpp testMain.hpp
-	g++ $(TESTFLAGS) -o $@ $< -L $(LIBDIR) $(WINDOWSLIBS)
+	g++ $(TESTFLAGS) -o $@ $< -L./ $(WINDOWSLIBS)
 
 CiphersDBG.exe: main.cpp testMain.hpp $(LIBFILES)
 	g++ $(DEBUGFLAGS) -o $@ $< $(LIBFILES)
@@ -85,4 +88,4 @@ cleanLinux:
 
 #Windows Remove
 cleanWindows:
-	rm -f lib/*.lib Cipher*.exe
+	rm -f *.lib Cipher*.exe