Refactored out all the BugginOut garbage