Feature/backlog 1146

@lucasvanlierop can this be merged, removed or at least renamed to junk/?