Help me feature peter

merge this ish