Added vm todos