Work done on most classes. Issues with pile and player require more work.
Solved the important merge conflict. Will override the rest.