fixed merge conflict (?)
begin prototyping code snippet thing.