initial commit. #untested
cleanup and journaling spike