Pre merge application

All Code is in one place now