Gathered more functionality; not working with nw yet