Major Progress

Added a lot of functionality since last time I uploaded anything