catching up commit
finished basic views
slight correction