Vid 1383

Don't merge just yet, still have to figure out why the last couple assertions are failing.