Added high-level module and minor stuff