Added almost everything to spec