Rewrite into on class in preperation of deployment

Signed-off-by: bjanssens <bjanssens@inuits.eu>