Cleaned up code. Now everything based off grid.