Lots of additions, more framework building