Added more functions, plugin getting close to being done.