Scoping almost complete except static and dynamic dispatch
Fixed merge conflicts