working on the next chapter in the future branch