Dynamo updates and Context Support

#77 Allen, please review.