Big updates. Everything working