Most functionality works

Most stuff works might be a bug or two
Merge branch 'Dan's-Branch'
work on views
Merge pull request #1 from empowerchris/dan

Dan