Adding stubs and controls
Adding debugging and persistence