More setup
Add model and layout files
Add discarding from UI