Model build out, views and controllers