Added a lot of stuff I forgot