begining blueprint implementation
Changes in structure