Pushing the rest because i fixed it!