WIP
almost done i think
fixes