changes towards getting dynamics working