More services refactor. Current main view broken