completed figures, moved +pop out
added simulation classes