Added in data saving. Start to implement gridview