Continued work on forms