Work on bikes

Further work will be in another branch