First somewhat useable code

Still not install ready, only works on Mac/Linux, but at least the intended enhancement works...