Lesser details. Looks ready for proper testing by Kristin.