Rebase feature + part of history by @FezVrasta

ping @FezVrasta - you might want to style this with a new PR