Reorganize things a bit. Also pull bugID from the model.