Full parsing

Still need refactoring