revised floor, completed(?) main,created makefile