pre-merge with menorca app
merged after menorca app
added template