Interweaved the interface and puzzle
Fix merges