Updated Interface

Work in progress, will do more tonight and tomorrow.