Cleanup, and updated for the latest version of GBCardStack
Clarified, and added analytics module