Made some better interface updates and added a way to test it