use refactored celestrium; get working except for search around
Merge remote-tracking branch 'refs/remotes/origin/user-testing' into user-testing