consolidating all morris functions into one file

unit tests working