Finished updating logic

- Entering test phase now