Start moving some logic into a base package.