Got it actually working

Needs some touchup and to be tested on Quickplans