Added rudimentary implementation of base features