Adding rest of dev code.