Started mapping, small changes in other files
Extended mapping (including opencv)