More classes
Only Loads, lines and switches fully implemented