Renaming and more testing funcs
More functions