second (unfinished) pass to commit so i can sleep and not lose code :D