Big update. first commit from within Notanos!