I am now developing Ocarina 4.7
A bit of separation is good here, and it should help with managing the code.