Started merging gui and objects