Changed some things, still have a lot of issues