Updated to initially functional version that works with BOAH deployment