Begin to fix big Design Issues