wip
Adding testing files.
Updated using functional patterns.