Inital commit of conversion to cross-platform version