London hackathon

Adding missing bits and removing hibernate