Moving aspects to it's own thing