Moved a couple of functions around

 - Again, just pushing to make it available.