started Jenjens integration / refactor