Lots of restructuring in order to accomodate my better understanding of the Sugar ORM. Still think it's worth it, but I'm worried about solving problems that it might throw