Merged conflicts with working version of GUI