minor
Almost done, alpha