Added makefiles and finished implementation