Big bunch of design changes; gem updgrades