working on full features