Pull from master since most of the functionality seems to be sorta working.

yeah