almost final commit i guess