still fixing routing/view logix