This is still kinda hacky - when we do the integration work on webmaker.org we'll make this cleaner and add in these error cases...