Adding a bunch of stuff to catch up