new probs with forms, need a merge and resolved errors in forms so I can pull from upstream