New form

Please leave a README note regarding this hardcoding. We should do it better, in a future iteration.