Finished implemeting table view
Merge branch 'datafunctions'