wip on ahsley 1.0.1