Completed Assignment

Tested working functions