Completed both functions

2 functions completed and ready for submission