Rework

Happy to merge this into development.