task #76166956 - finished up this task. not much in this commit since most was pushed right into the branch, to be honest im probably going to push this into dev