some spiking, some refactoring, some fixing; some good, some bad - a little of both