[Master] Kind of hacky, but submission works