Grid, started refactoring input