Alan/hatta-dev archive