Basic parsing structure complete
Added notes
Reformatted tests