Commit 23

Parent being correctly set now