Omer Initial Push
Merge branch 'Omer'