Refactored Bosses to work against inerfaces
Fixed merge conflict from hell