Working on trigger and misc stuff