Added options and attributes

Still new to this, sorry if I mess it up!