Whoops, Typos/forgot to declare some vars