Tons of GUI work
Merged conflicts