Updates so that the correct methods get called in order.
Working through setup