Another import tidy, wow it gets messy fast