Added more structure and stubbed functions