Synchronizing with Aritei

Replaced old work in repo with Aritei's progress