Redo these to make a better system