expansion somewhat works (many bugs)