issueID #11 (Roel) All done except for filling in table. Almost ready for merging