Forms Updates

Updated, added more forms code