Controllers and views now (almost?) working