pretty much finished everything up I think