Moved map guts back into model, fixed spec failures.