First commit; copied relevant files from ecostem, with minor modifications; commented out lots of stuff