Added new things! And broke working things in the process :(