Hey try this

made a new fork. should be able to merge easily.