More basic changes, attempting to handle dependencies