TODO: 

  * Add atom support
  * Add tests

