Almost looking MVC like now