Refactore things a bit to simplify them, and commented out running in series