Initial commit for 1.5
Cleanup and nearing final commit for 1.5
Final commit for 1.5