Fixed main Shold work now Going into testing as we speak