WIP
finish bicycle search
clean master
solve merge conflicts
resolve conflicts with master