Implemented two more functions.
wip
Resolved Conflicts