Nick fane dev branch

I want to merge my code into the main