Added Parse Framework
Merging greg's changes