Cleaned code, Final 1.0 push