Tested but a lot of work still needs to be done. Making decent progress though...