Added a few more things but it's broken. :(