Initial commit, with full set of features