I have this working for now, but eventually I will move