Added some additional functionality; tryin gto build an interface