Some refactoring and start of poster