WIP
Got it working