Cleaned up some code and got a scratchpad in the app