Henrik Reitan #004 markers
Added TextHandler