Deeply modifed parser and organisation, still a lot of prettifyng to do