Adds new main

Change-Id: I27ef6e1b1b59095ab209f233aa09be5b1ac694c8