Re-sorted variable declarations and worked through all compilation errors except mystery module complaints.