Initial commit of rest of app