fixed linking errors to put everything in the same bundle.
Almost finished button Work.