fully functional
Merge branch 'oddur_and_me'