Rid of #defines
Resolved unresolved symbols list

Resolved symbols. Added printfs