Made some changes and bootstrapped it.