Lots of architectural changes & roughin in of methods