Work in progress to add mapper and actor