added the fromDict stuff