cleaned up a bunch of warnings, theres one left, but it looks like there's missing code...