Feature/stuff requests

@h-marvin please review, merge... do it.