Added random property generation. Also commit before big changes in structure.