Encapsulation class mostly operational; should only require minor tweaks from here