commit #2

maybe 15% there