Inputs now compatible had to rewrite a lot, need buttons to be