Nearing Completion of views/controllers