This week I continued the euphoria refactoring, just minor things left (I hope)