Added initial forms, plus a few helper classes