Working on a better init for neutron-2013.2