Update some code
Started map class