Forms part1
Commited lost files, updated forms
Merge master