adding augmented form stuff mostly