made some progress on includes n layout. maybe.