Finished preliminary edits, need to test with toy data