Changed a lot of things
Merge with sayyid's
Moved pauline's files inside app