Added base for fake names and moved stuff around