Done a bit more work on Form 2