Feature/custome submit

**PLEASE REVIEW**