big wip push. i think everything is broken but i dont want to forget these changes