Lots of refactoring, adding some exceptions for boss/seed