Updated for 1.0

This is everything but the items