Moving stuff arround, step 2...