Singelton added, OS X target added…. getting there.