testcommit
Finished card handling, re-organized model