Great Advancements since last push
Fixed conflict problem, back to working state