Refactored code, prepared to do final_draw func now