Further working on getting previous functionality working with the new structure.