still working on the include bug