Implemented more stuff from PoC