implemented some card modules and slowly removing old modules