WIP
Removed some work in progress