Finished up shift-click support