Major update

Added a lot of functionality