UNDER CONSTRUCTION: rewriting couple of methods and classes.