Form integration complete, closes #42