tidying some things up, got a running app