WiP - changes

Making some serious changes here. Committing for ref.