First complete version with all functions

added all the real functions with most of olivia's code commented out
at the end