Started toggle button class for discrete values + some cleanup. Also mistakingly upgraded to Xcode 5...