Feature/initial

If this commented out code intentionally left in, it should come with a better explanation.. I'm guessing it was just missed in the patch cleanup.