initial push of complete ui integration