parsing files more properly
 add new class for the entries atom