catching up on lots of work

- mostly working now