Finally found some time to work on this again!