Update Neuron to better separate concerns and test.