[WIP] Feature/inspiran master

just putting this PR that should be -f into master