Contact & Apyrum roughly done
Conflict fix