Tried to pick a naming convention to stick with, and fixed the extend methods