TODO's for fixing fee mechanism