Finished porting to Redis
Slight refactoring