cleanup, finally have some idea of direction again after figuring out the limitations of Go a bit better.