Resolution class done, not really tested
Merge branch 'TashIsLLCoolJ'