dictionary and added testhaikus
fixed merge errors (alex we have to look out when changing things)