Feature/data entry (+ Feature/datafix's changes)

Added support for data entry, saving (Also includes changes made in other PR)