Version 1 now has comments and works properly