IN PROGRESS..
Mostly mre token replacements..