Functionalizing
Fixing typos, finishing up functions