Adding more options and stuff