Iteration 2 Issues

Current state of project, issues since iteration 1 and aims for next
iteration