Temporary Fix

Ok I made ti so everything builds with Nicholas latest changes to the data types.  Expects some merge issues Zach with your data types.  Next time we should wait until all the data types change before pushing to master