starting to integrate Planet close #2

still have bugs