Completed All Functions

Need formatting + checking with specs on project website