Attempting to make everything work