Updated docs, draft code