Mondays End Commit

Resolver and Current() are commented, try to realize next time.