More internalized animations, and map entrances

Oh boy.