working on making everything work