Added more non functional boss code
Fixed merge conflict