Feature/now 564

okay. Looks good to merge.