Beginning to refactor design into stackable modules.