Reflection and parsing added but not quite there