Beginning the looooong todo list. bugfix, bugfix and bugfix :)
Resolving conflict