Still working on that model view controller code