Started rewrite of KB