More really good changes, this thing gets more testable by the minute!