Make thread safe
Whitespace
Better marble string parser