Pulling in changes

splitting out areas more to make choices hopefully easier later.