fuck it, committing what i have so far