Add Groovy and Lodge

Fix #4 and #5