Update from local

A simple version not playable yet.