Big ol' change to simple system that seems to function but needs a lot of work.