WIP: Tests nearly all passing