Booyah! refactor + fixes.