Lotsa lotsa changes. Heading towards finishing this.