First major pull

Check commit for all changes