Updated to handle note threads, if you guys think it's a good idea