Converting to a remote/local architecture and also to using Xtend.