Pushing up still untested code. Need to thank @jezdez tons