some logic changes
started adding mustache service unit tests