merging dev work from typescript branch