repository and riak
major overhaul