moar button stuff
Working on wrapper