Adding atom support, javasript and stuff..