Moved to MVC modeling and added init/reset files for testing