added forms closes #18