Re-done submit-form + more
Database should now contain everything that is needed