New data structure
Merge origin/master
Added data functionality
Improved viewer view