Put in most of core from old combot project