Started consolidating Objects and Elements into Aspects.