Rearrange properties
Add QEA builder stuff.