Finish initial cipher implementation