Starting work on replacing type class dictionary placeholders