Version2rehaul

Updating the application to version 2.