all the things are better now
merged master lol