Got things working

Finally