itching to commit something... partially works, maybe