More Developed Data Structure

Added basic data structure and handling