Major revamp plus new boxes (yeah, I failed to commit things along the way and ended up with a huge commit :P)
Reduce the amount of memory / cpu taken by VMs