Add base logic #1