Moving over to my newly build starting framework. Now need to back out the things that don't belong and add the things that do.