Fix propogation and use calculated x/y vars where appropriate
Use calculated x/y values
More bounds stuff
Test stuff for bounds