Small tweaks, I think all guts are working now, need to refine user input