Minor refactoring. Shield connection needs lots of work.