Got it fully working