Further improvements, fully functioning now.