Many edits
Removed XIBs
Many additions