first commit after getting back to this.