Adding all the bells and whistles