Merge pull request #11 from apost906/Ashley_2.0

Ashley 2.0
Did stuff

and Things
Negate Z!
IT works for one example

more testing required
Both phases work
More testz

*Test 5 breaks everything!