Starting to refactor code… work on Display Data now