Fixed calcX() function
Add output statements
First design-focused commit