Initial commit of app - rewiring required