Finished up the tool decorator