still wip but not as broken