That boolean should probably be something else