done

changed variable calls to get methods