Kipyatochkov

A large modification that adds a lot of new content