Initial Commit
Code Cleanup + Bugfixes
Code Cleanup + Bugfixes