Updated and prepped for github