Oops, got mixed up editing file between XCode and Sublime...only half the changes made it...ugh