updates to code, goes with first draft of TryDart