First commit
Second commit
Merged Apple and Windaids branch. Nao Winple