Start implementing #78