Initial commit, renaming functions