Only did a little work. Am very tired...messing around with testing
aggregate and service and whatnot.

Signed-off-by: bill-mybiz <bill.mybiz@gmail.com>