running but many things need fixes now with new structure