almost
just about there
Got it sorting. Just needs a little cleaning up.