first commit...broken grid. yay.
fixed conflicts