Have a look at my repo too. I did the separation maybe you can pull up some of the code directly from there. Will save some effort.