WIP: Implementing a new saner an cleaner architecture.