best driving yet after a huge refactor