Added in map stuff and nested the controllers