6 Jun 2013 - Class structure complete