Major Changes and Improvements

Basically Working
Other