Working on expanding universe, doesn't work yet