Add icon, start working on math