Initial commit with aurora-2 working