prepare for merge
Merge handle bars stuff