Most features done and working