Adding my stff combined with Christian's. Code is pretty messy right now, needs a lot of cleaning.