Some re-factoring to backprop (want to test)...