Changed Map to Grid, edited TODO