Lots of new classes . fininshed implementing framework