still a lot of work to do here, I want to clean this up, but there isn't much to clean so it's fine for now I think..
