More work on submit feature.