Finalised the prototype

Fixed (commented out) some errors so the app would run.