Stubbing out functions

Code organization