adding form
Merge branch 'f-static_stuff'