Mostly working version
Minor enhancements. Readme added