Finished the project

-Finished basic functionality
-have some topical changes to make