Started initial implementation for mapper