Finishing up for now, may come back to this