Split methods up for re-use. Update sidebar