Worked on MVC classes (still need to extract reusable parts)