Feature/data entry

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