Work in progress on restructure.