Should have the reading of the butterfly list working.
pushing stuff for curtis to auto fix with eclipse
merged core