Form is working with just needs some polish and added functionality