More ugliness

will have useful comments if i can get this to work.