First commit after introduction of ordered neighbors. Revert to previous commit to reset all changes and potential errors. Version compiles but was not tested (drivers missing on work pc). Commited to allow working from home and travel.