wip commit, turning in for the night