reconsolidated cinder into controller ...for now