Merged work

Merging stuff together. Nothing really new.