Shanes branch

here we go now