Qs and Ns implemented as attributes of Face class; corresponding methods added to Face class
Merged