Breaking change - Trying to fix up some of my TODO's #5