Move some stuff around for speed and for exception checking
Merge branch 'master' of github.com:JoshAshby/Fla.gr into couch_collections