Finish form integration #12