Abstracted some things. Made the make file better.