Initial commit, half working release, untested extend and block tokens