Add some more Dynamic stuff, and basic error handling.