Getting closer to my perfect build