Initial Commit
Share Data between Controllers
Resolve some conflicts