First commit with working map