Re-ordering this file so it's clearer what needs to happen next.