Model stubs

Adding stub code for model
Clean up

Random clean up tasks