minor changes to try and implement unit -> unit
Implemented map and combine. Both not tested.