Initial commit, many todos