hacked around, fixed regex, some cases. need to work on
composition/aggregation cases.