Got unit tests passing, but there's a lot of kruft and noise, and a lot of unit tests still need to be added