Path is code complete, need to add tests