Fuckity phew; all GUI branch changes merged