B version and A version working.

Just need to do final checks and make sure everything is good