Added some major stuff and bug fixes

Still attempting to test.