Did some tiny change and about to get some sleep before continuing this.