Have the view partially working, trying to fix it up