premerge commit
Refactored a bit and added function to push data elements to page.
Merged