Working on filling in the basic views