pieces in good working order?

now grabbing correct variable names too.