Aaron's latest updates, incomplete WIP