Geddy app
First merge