little more parser, will pick this up again later