ERT Changes

Major thing is separating ERT from keycard authentication. Also has a commit from master it looks like.