Added shaft stuff
merged