Tried to update for Blaze.

+ about to clean all of that up now