Booyah. Cleanup + Some new methods.