Created a grid system, fixes issue #1