Things still don't work but their closer