Sort of working
Merged