Some fixes, make this actually work. Lots of fixes. Lots to do.