refactored rendering
refactored rendering
Merge remote-tracking branch 'origin/master' into beta
Battleship got trashed.. fixing forward