Using new Proxy to wrap DisplayObjects

Also bug fixes, too.
Engine tiles and conflict resolution

ya ya I did stuff.