Move stuff out of prototype