Commit 3

Working code as on 4/6/2014 at 10:47 p.m