Added todo, restored random particle generation