Add beginning logic to gather system; Simplify method and var names