Started working the way I wanted it to