First commit, add new features