Few more initial updates
Structure experimentation