WIP awesomeness
Addes submission types