Small architecture change

Add a bunch of gems