WIP
Fixes issues