almost done adding dynamo. gotta tidy things up than add dynamo