All implemented but a nasty bug has been found