Changed parsing structure
cleanup
added first stub of grid refresh
connection mapping