Assignement 1 - WIP - contacts + prettify + some fixes