Cardaction

Fixed a bunch of details. Please merge and make sure you pull down AND AND AND rebase your current branches