wip, fix it where it is breaking