First stab at it. Needs some more work but def a step up
Cleaned it up a little bit. i think its good enough for mainline for now