Feature/backlog 1035

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