Unstable commit, needs more work to make map work