Adds more options to make this more viable