Rebased. Structure now starting to take form. Missing a lot though :-).