first quick commit, going to fix friction asap