* WIP: Working with new structure - now onto tweaking everything