Map weights

#21 
Need to pull master and rebase and re-push this code.