Galya feature

Please review my changes.