Implemented more things from poc.py in the main project