First real commit. Adding all of Ankush's code + some viewing code.