Move render into core