start refactoring
First orbit generator, fixed bugs