mostly have the new style working, just a few issues