consolidate stuff. might be able to take this further actually.