Knocked off some TODO items, more tests passing!