Moved grid related stuff to Grid, rewrote routines, works better now.