Adding in some more changes, we're almost done here folks