Started implementing the new Models