Billylee feature branch remerge to Develop, with mostly implemented user API