much more progress - soon these commits will mean something