Initial version, without string substitution working