Commit 16

Still issues with final 4 systems.