Neural Network additions

This is not a large merge, but it's general stuff I think should already be there.