oh my this is coming along much better... after removing dead code