Simplest -ish implementation of current functionality