Putting those proxies to use

Signed-off-by: Aeryk <aeryk17aj@gmail.com>
Refactoring stuff