Editing members for #7

Also got "Completion" working.