3deck added, some refactors and TODO added