new ideas for API, moved controllers around