Realistic simulations

More realistic simulations were developed. Seems ready to merge back to the main branch.