Initial semi-working build