6/24/14:pushed some of the logic on Parser up to its parent. started on a simplified parser, which sould be a lot more robust than the current parser.