Half way done added var and conditionals