After going through the process of getting this working using the unit files, I found a few issues that are fixed here.