Merge with Lucas's-Branch and fixed broken things

Done ghettoly because GitHub just refuses to work

I hate GitHub