Feature/now 564

I created this branch off a separate branch with changes by accident