intermediate commit. everything is broken and i'm tired