Initial work to add a boss