Version 2

Unfinished, but improved. No comments