Clean up autoloading
Income source commands take id in
Progress on income source story

This is getting messy.