Feature keen

Take a look, see if there's anything glaringly bad, and if not..  let's merge!