System bolt 3

Unit tests past 30 times in row, i've been testing this for a full day on a test storm cluster.