Stuff's fully working, ready for merge!