Trying to stop using void rather than int

Also breaking shit all over the place