Almost Finished

Need to add more into context file, and create references.