I guess I have some renaming to do to make this work right..