Fix #5, get very basic results showing for #2