refactoring, implementing factories and grid creation