Always with the bugs and whatnot...#2