WIP - work on complete spec restructure