WP1 Task 1

Work in progress.