Repository for merging Srdjan's and Ilija's work