stubs. moving back toward sanity...
merge conflict
GNNN
booyah