horrible wip fixes and breaks