Major bug fix Mark 2

Must include very important, wow