diff --git a/TODO.txt b/TODO.txt
new file mode 100644
index 0000000..14617ab
--- /dev/null
+++ b/TODO.txt
@@ -0,0 +1,6 @@
+Need to match new guidelines
+https://en.ru.is/st/de/graduate-study/
+https://en.ru.is/media/skjol-td/TD_E-cover_2019.pdf
+https://en.ru.is/media/skjol-lagadeildar/Instructions_2019.pdf
+https://en.ru.is/rules/study-and-examination-rules/rules-on-submission-of-final-theses-at-ru/
+http://english.enicnaric.is/iqfhe.html
diff --git a/ruthesis.sty b/ruthesis.sty
index f516373..894cfae 100644
--- a/ruthesis.sty
+++ b/ruthesis.sty
@@ -506,6 +506,19 @@
 %\renewcommand{\title}[2]{\renewcommand{\thetitle}{#1}\renewcommand{\thetitleIS}{#2}}
 \newcommand{\titleIS}[1]{\renewcommand{\thetitleIS}{#1}}
 
+%% LaTeX3 attempt at smarter titles
+%% Still a work in progress --foley 2022-2-3
+%\% NewDocumentCommand\thesistitle{O{#2} m}
+% % ARGS: [optional use #2], {mandatory} 
+% {
+%   \NewDocumentCommand\theenglishtitle{}{#2}%babel naming convetion?
+%   \NewDocumentCommand\theicelandictitle{}{#1}
+%   \iflanguage{icelandic}
+%   {\title{\theicelandictitle}}
+%   {\title{\theenglishtitle}}
+% }
+
+
 %% Clean up some formatting for the text
 \renewcommand{\thepage}{\roman{page}}
 
@@ -703,7 +716,7 @@
 
 \renewenvironment{abstract}
 {\begin{otherlanguage}{english}\begin{coverleft}{\centering%
-    {\titletitlefont\thetitle\\}%%
+    {\titletitlefont\theenglishtitle\\}%%
     \vspace{\baselineskip}
     \theauthor\\%
     \vspace{\baselineskip}
@@ -716,7 +729,7 @@
 
 \newenvironment{abstractIS}
 {\begin{otherlanguage}{icelandic}\begin{coverleft}{\centering%
-    {\titletitlefont\thetitleIS\\}%%
+    {\titletitlefont\theicelandictitle\\}%%
     \vspace{\baselineskip}
     \theauthor\\%
     \vspace{\baselineskip}
diff --git a/test.tex b/test.tex
index 68b830e..30655ee 100644
--- a/test.tex
+++ b/test.tex
@@ -1,11 +1,14 @@
 \documentclass{memoir}
 \usepackage[online,IS]{ruthesis}
 \usepackage[useregional]{datetime2}
+\usepackage{xparse}%Latex3 argument parsing
+
+
 %\usepackage{graphicx}
 \title{Minimal Document for Testing}
 \author{Joseph T. Foley \and Someone Else}
 % \author:  Use \and as a separator and \thanks{details} for additional info
-\date{\DTMdisplaydate{2020}{2}{2}{-1}}
+\date{2020}{2}{2}
 %% TODO:  use datetime2 to be smarter about dates
 
 % \usepackage[icelandic,english]{babel}
@@ -17,6 +20,8 @@
 %\ects{30}
 
 
+
+
 %% Titlepage the Memoir way
 \maketitle
 
@@ -36,6 +41,22 @@
 
 \newpage
 \chapter{Test Chapter}
+\newcommand{\varEN}{***English***}
+\newcommand{\varIS}{***Icelandic***}
+\NewDocumentCommand{\setVar}{O{#2} m}
+% ARGS: [optional use #2], {mandatory} 
+{ 
+  \renewcommand{\varIS}{#1}
+  \renewcommand{\varEN}{#2}
+}
+\setVar{Universal Title}
+  
+  \begin{itemize}
+  \item English: \varEN{}
+  \item Icelandic: \varIS{}
+  \end{itemize}
+
+
 blah blah blah
 %\copyrightpage{}%%RUM: Not mentioned
 %\signaturepage{}%%RUM: "Signature page (standard format)