Bin and other stuff working again.
Merge branch 'prototype01' into start_up_screen