Added new form totally untested
Added some options pages