I think there are a bunch of extra fields here that aren't needed?