V1.1

After a week of no internet, have 1 massive commit for V1.1!