Think ive got it
Final commit for release