Basic clean up
algo compiles
rename
Rename
Add new stuff