wow I'm doing terribly at committing... it's a mess, but it's getting there