initial commit
misc cleanup
current state
status again