Map lerping

Need to fix bug with black bar
Merge remote-tracking branch 'origin/Josh'