intermediate push - stuff's still broken, but almost done generalizing the neural net architecture