Added log back
First big commit