Initial import fix
Made it not abstract