Added appropriate forms, bootstrap, specs, and corrected models