Functions completion ready for turn in

Functions completion ready for turn in