Moving forms over to a more standard format.