Added simple forms, edited stuff