Adding more logic and views...