parsing refactored, based on attributes - work in progress
new look & feel after massive refactoring