Partial (Still WIP) of https://jira.surfconext.nl/jira/browse/CDK-94