Work on Aspects
Hopefully finished new aspect system