Still working on the Fab, breaking into smaller methods. Organised imports too