squashed most of commits, ready to review & merge now ^