I want it all. Fixes #361. Fixes #333. Fixes #323. Fixes #360.