diff --git a/Data/DataModel/EventAdmins.cs b/Data/DataModel/EventAdmins.cs
index bbcb66fa..27a391d9 100644
--- a/Data/DataModel/EventAdmins.cs
+++ b/Data/DataModel/EventAdmins.cs
@@ -11,7 +11,7 @@ public class EventAdmins
         /// Foreign key - event table
         /// </summary
         [ForeignKey("Event.ID")]
-        public virtual EventOwners Event { get; set; }
+        public virtual Event Event { get; set; }
 
         /// <summary>
         /// Foreign key - user table
diff --git a/Data/DataModel/EventOwners.cs b/Data/DataModel/EventOwners.cs
deleted file mode 100644
index c69df6b5..00000000
--- a/Data/DataModel/EventOwners.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace ServerCore.DataModel
-{
-    /// <summary>
-    /// The users who are owners for this event
-    /// </summary>
-    public class EventOwners
-    {
-        // ID for row
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int ID { get; set; }
-
-        /// <summary>
-        /// Foreign Key - event table
-        /// </summary>
-        [ForeignKey("Event.ID")]
-        public virtual Event Event { get; set; }
-
-        /// <summary>
-        /// Foreign Key - user table (owner)
-        /// </summary>
-        [ForeignKey("User.ID")]
-        public virtual PuzzleUser Owner { get; set; }
-    }
-}
diff --git a/Data/DataModel/PuzzleUser.cs b/Data/DataModel/PuzzleUser.cs
index f4b81f9c..e5c2242d 100644
--- a/Data/DataModel/PuzzleUser.cs
+++ b/Data/DataModel/PuzzleUser.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Microsoft.AspNetCore.Identity;
@@ -32,5 +33,25 @@ public static PuzzleUser GetPuzzleUser(string identityUserId, PuzzleServerContex
         {
             return dbContext.PuzzleUsers.Where(user => user.IdentityUserId == identityUserId).FirstOrDefault();
         }
+
+        /// <summary>
+        /// Returns whether or not a user is an author for the given event
+        /// </summary>
+        /// <param name="thisEvent">The event that's being checked</param>
+        /// <param name="puzzleServerContext">Current PuzzleServerContext</param>
+        public bool IsAuthorForEvent(PuzzleServerContext puzzleServerContext, Event thisEvent)
+        {
+            return puzzleServerContext.EventAuthors.Where(a => a.Author.ID == ID && a.Event.ID == thisEvent.ID).Any();
+        }
+
+        /// <summary>
+        /// Returns whether or not a user is an admin for the given event
+        /// </summary>
+        /// <param name="thisEvent">The event that's being checked</param>
+        /// <param name="puzzleServerContext">Current PuzzleServerContext</param>
+        public bool IsAdminForEvent (PuzzleServerContext dbContext, Event thisEvent)
+        {
+            return dbContext.EventAdmins.Where(a => a.Admin.ID == ID && a.Event.ID == thisEvent.ID).Any();
+        }
     }
 }
diff --git a/Data/IPuzzleServerContext.cs b/Data/IPuzzleServerContext.cs
index 5f1a6622..06f2991c 100644
--- a/Data/IPuzzleServerContext.cs
+++ b/Data/IPuzzleServerContext.cs
@@ -7,7 +7,6 @@ public interface IPuzzleServerContext
         DbSet<Event> Events { get; set; }
         DbSet<EventAdmins> EventAdmins { get; set; }
         DbSet<EventAuthors> EventAuthors { get; set; }
-        DbSet<EventOwners> EventOwners { get; set; }
         DbSet<EventTeams> EventTeams { get; set; }
         DbSet<Feedback> Feedback { get; set; }
         DbSet<Invitation> Invitations { get; set; }
diff --git a/Data/Migrations/20181108042647_RemoveEventOwners.Designer.cs b/Data/Migrations/20181108042647_RemoveEventOwners.Designer.cs
new file mode 100644
index 00000000..7fdb1c8d
--- /dev/null
+++ b/Data/Migrations/20181108042647_RemoveEventOwners.Designer.cs
@@ -0,0 +1,806 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using ServerCore.DataModel;
+
+namespace Data.Migrations
+{
+    [DbContext(typeof(PuzzleServerContext))]
+    [Migration("20181108042647_RemoveEventOwners")]
+    partial class RemoveEventOwners
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex")
+                        .HasFilter("[NormalizedName] IS NOT NULL");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex")
+                        .HasFilter("[NormalizedUserName] IS NOT NULL");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.ContentFile", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("EventID");
+
+                    b.Property<int>("FileType");
+
+                    b.Property<int?>("PuzzleID")
+                        .IsRequired();
+
+                    b.Property<string>("ShortName")
+                        .IsRequired();
+
+                    b.Property<string>("UrlString")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.HasIndex("EventID", "ShortName")
+                        .IsUnique();
+
+                    b.ToTable("ContentFiles");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Event", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("AllowFeedback");
+
+                    b.Property<DateTime>("AnswerSubmissionEnd");
+
+                    b.Property<DateTime>("AnswersAvailableBegin");
+
+                    b.Property<string>("ContactEmail");
+
+                    b.Property<DateTime>("EventBegin");
+
+                    b.Property<bool>("IsInternEvent");
+
+                    b.Property<int>("MaxExternalsPerTeam");
+
+                    b.Property<int>("MaxNumberOfTeams");
+
+                    b.Property<int>("MaxTeamSize");
+
+                    b.Property<string>("Name")
+                        .IsRequired();
+
+                    b.Property<bool>("ShowFastestSolves");
+
+                    b.Property<DateTime>("StandingsAvailableBegin");
+
+                    b.Property<bool>("StandingsOverride");
+
+                    b.Property<DateTime>("TeamDeleteEnd");
+
+                    b.Property<DateTime>("TeamMembershipChangeEnd");
+
+                    b.Property<DateTime>("TeamMiscDataChangeEnd");
+
+                    b.Property<DateTime>("TeamNameChangeEnd");
+
+                    b.Property<DateTime>("TeamRegistrationBegin");
+
+                    b.Property<DateTime>("TeamRegistrationEnd");
+
+                    b.Property<string>("UrlString");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Events");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventAdmins", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("Event.ID");
+
+                    b.Property<int?>("User.ID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Event.ID")
+                        .IsUnique()
+                        .HasFilter("[Event.ID] IS NOT NULL");
+
+                    b.HasIndex("User.ID");
+
+                    b.ToTable("EventAdmins");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventAuthors", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("Event.ID");
+
+                    b.Property<int?>("User.ID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Event.ID")
+                        .IsUnique()
+                        .HasFilter("[Event.ID] IS NOT NULL");
+
+                    b.HasIndex("User.ID");
+
+                    b.ToTable("EventAuthors");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventTeams", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("Event.ID");
+
+                    b.Property<int?>("Teams.ID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Event.ID")
+                        .IsUnique()
+                        .HasFilter("[Event.ID] IS NOT NULL");
+
+                    b.HasIndex("Teams.ID");
+
+                    b.ToTable("EventTeams");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Feedback", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("Difficulty");
+
+                    b.Property<int>("Fun");
+
+                    b.Property<int?>("PuzzleID");
+
+                    b.Property<DateTime>("SubmissionTime");
+
+                    b.Property<int?>("SubmitterID");
+
+                    b.Property<string>("WrittenFeedback");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.HasIndex("SubmitterID");
+
+                    b.ToTable("Feedback");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Invitation", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("EmailAddress");
+
+                    b.Property<DateTime>("Expiration");
+
+                    b.Property<Guid>("InvitationCode");
+
+                    b.Property<string>("InvitationType");
+
+                    b.Property<int?>("TeamID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("TeamID");
+
+                    b.ToTable("Invitations");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Prerequisites", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("PrerequisiteID");
+
+                    b.Property<int>("PuzzleID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PrerequisiteID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.ToTable("Prerequisites");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Puzzle", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("EventID");
+
+                    b.Property<string>("Group");
+
+                    b.Property<bool>("IsFinalPuzzle");
+
+                    b.Property<bool>("IsGloballyVisiblePrerequisite");
+
+                    b.Property<bool>("IsMetaPuzzle");
+
+                    b.Property<bool>("IsPuzzle");
+
+                    b.Property<int>("MinPrerequisiteCount");
+
+                    b.Property<string>("Name")
+                        .IsRequired();
+
+                    b.Property<int>("OrderInGroup");
+
+                    b.Property<int>("SolveValue");
+
+                    b.Property<string>("Token");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("EventID");
+
+                    b.ToTable("Puzzles");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleAuthors", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("Puzzle.ID");
+
+                    b.Property<int?>("User.ID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Puzzle.ID");
+
+                    b.HasIndex("User.ID");
+
+                    b.ToTable("PuzzleAuthors");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleStatePerTeam", b =>
+                {
+                    b.Property<int>("PuzzleID");
+
+                    b.Property<int>("TeamID");
+
+                    b.Property<string>("Notes");
+
+                    b.Property<bool>("Printed");
+
+                    b.Property<DateTime?>("SolvedTime");
+
+                    b.Property<DateTime?>("UnlockedTime");
+
+                    b.HasKey("PuzzleID", "TeamID");
+
+                    b.HasIndex("TeamID");
+
+                    b.ToTable("PuzzleStatePerTeam");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleUser", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Email");
+
+                    b.Property<string>("EmployeeAlias");
+
+                    b.Property<string>("IdentityUserId")
+                        .IsRequired();
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<string>("TShirtSize");
+
+                    b.Property<bool>("VisibleToOthers");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("PuzzleUsers");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Response", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("IsSolution");
+
+                    b.Property<string>("Note");
+
+                    b.Property<int>("PuzzleID");
+
+                    b.Property<string>("ResponseText")
+                        .IsRequired();
+
+                    b.Property<string>("SubmittedText")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.ToTable("Responses");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Submission", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("PuzzleID");
+
+                    b.Property<int?>("ResponseID");
+
+                    b.Property<string>("SubmissionText");
+
+                    b.Property<int?>("SubmitterID");
+
+                    b.Property<int?>("TeamID");
+
+                    b.Property<DateTime>("TimeSubmitted");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.HasIndex("ResponseID");
+
+                    b.HasIndex("SubmitterID");
+
+                    b.HasIndex("TeamID");
+
+                    b.ToTable("Submissions");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Team", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("CustomRoom");
+
+                    b.Property<int?>("EventID");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("PrimaryContactEmail");
+
+                    b.Property<string>("PrimaryPhoneNumber");
+
+                    b.Property<int?>("RoomID");
+
+                    b.Property<string>("SecondaryPhoneNumber");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("EventID");
+
+                    b.ToTable("Teams");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.TeamMembers", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("Team.ID");
+
+                    b.Property<int?>("User.ID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Team.ID");
+
+                    b.HasIndex("User.ID");
+
+                    b.ToTable("TeamMembers");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.ContentFile", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany("Contents")
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventAdmins", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithOne("Admins")
+                        .HasForeignKey("ServerCore.DataModel.EventAdmins", "Event.ID");
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Admin")
+                        .WithMany()
+                        .HasForeignKey("User.ID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventAuthors", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithOne("Authors")
+                        .HasForeignKey("ServerCore.DataModel.EventAuthors", "Event.ID");
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Author")
+                        .WithMany()
+                        .HasForeignKey("User.ID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventTeams", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithOne("Teams")
+                        .HasForeignKey("ServerCore.DataModel.EventTeams", "Event.ID");
+
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("Teams.ID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Feedback", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID");
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Submitter")
+                        .WithMany()
+                        .HasForeignKey("SubmitterID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Invitation", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Team")
+                        .WithMany("Invitations")
+                        .HasForeignKey("TeamID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Prerequisites", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Prerequisite")
+                        .WithMany()
+                        .HasForeignKey("PrerequisiteID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Puzzle", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleAuthors", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("Puzzle.ID");
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Author")
+                        .WithMany()
+                        .HasForeignKey("User.ID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleStatePerTeam", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("TeamID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Response", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Submission", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID");
+
+                    b.HasOne("ServerCore.DataModel.Response", "Response")
+                        .WithMany()
+                        .HasForeignKey("ResponseID");
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Submitter")
+                        .WithMany()
+                        .HasForeignKey("SubmitterID");
+
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("TeamID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Team", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.TeamMembers", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("Team.ID");
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Member")
+                        .WithMany()
+                        .HasForeignKey("User.ID");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Data/Migrations/20181108042647_RemoveEventOwners.cs b/Data/Migrations/20181108042647_RemoveEventOwners.cs
new file mode 100644
index 00000000..4585dea4
--- /dev/null
+++ b/Data/Migrations/20181108042647_RemoveEventOwners.cs
@@ -0,0 +1,201 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations
+{
+    public partial class RemoveEventOwners : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EventAdmins_EventOwners_Event.ID",
+                table: "EventAdmins");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Events_EventAdmins_AdminsID",
+                table: "Events");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Prerequisites_Puzzles_PrerequisiteID",
+                table: "Prerequisites");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Prerequisites_Puzzles_PuzzleID",
+                table: "Prerequisites");
+
+            migrationBuilder.DropTable(
+                name: "EventOwners");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Events_AdminsID",
+                table: "Events");
+
+            migrationBuilder.DropIndex(
+                name: "IX_EventAdmins_Event.ID",
+                table: "EventAdmins");
+
+            migrationBuilder.DropColumn(
+                name: "AdminsID",
+                table: "Events");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "PuzzleID",
+                table: "Prerequisites",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "PrerequisiteID",
+                table: "Prerequisites",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldNullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EventAdmins_Event.ID",
+                table: "EventAdmins",
+                column: "Event.ID",
+                unique: true,
+                filter: "[Event.ID] IS NOT NULL");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EventAdmins_Events_Event.ID",
+                table: "EventAdmins",
+                column: "Event.ID",
+                principalTable: "Events",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Prerequisites_Puzzles_PrerequisiteID",
+                table: "Prerequisites",
+                column: "PrerequisiteID",
+                principalTable: "Puzzles",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Prerequisites_Puzzles_PuzzleID",
+                table: "Prerequisites",
+                column: "PuzzleID",
+                principalTable: "Puzzles",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EventAdmins_Events_Event.ID",
+                table: "EventAdmins");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Prerequisites_Puzzles_PrerequisiteID",
+                table: "Prerequisites");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Prerequisites_Puzzles_PuzzleID",
+                table: "Prerequisites");
+
+            migrationBuilder.DropIndex(
+                name: "IX_EventAdmins_Event.ID",
+                table: "EventAdmins");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "PuzzleID",
+                table: "Prerequisites",
+                nullable: true,
+                oldClrType: typeof(int));
+
+            migrationBuilder.AlterColumn<int>(
+                name: "PrerequisiteID",
+                table: "Prerequisites",
+                nullable: true,
+                oldClrType: typeof(int));
+
+            migrationBuilder.AddColumn<int>(
+                name: "AdminsID",
+                table: "Events",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "EventOwners",
+                columns: table => new
+                {
+                    ID = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    EventID = table.Column<int>(name: "Event.ID", nullable: true),
+                    UserID = table.Column<int>(name: "User.ID", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EventOwners", x => x.ID);
+                    table.ForeignKey(
+                        name: "FK_EventOwners_Events_Event.ID",
+                        column: x => x.EventID,
+                        principalTable: "Events",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_EventOwners_PuzzleUsers_User.ID",
+                        column: x => x.UserID,
+                        principalTable: "PuzzleUsers",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Events_AdminsID",
+                table: "Events",
+                column: "AdminsID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EventAdmins_Event.ID",
+                table: "EventAdmins",
+                column: "Event.ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EventOwners_Event.ID",
+                table: "EventOwners",
+                column: "Event.ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EventOwners_User.ID",
+                table: "EventOwners",
+                column: "User.ID");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EventAdmins_EventOwners_Event.ID",
+                table: "EventAdmins",
+                column: "Event.ID",
+                principalTable: "EventOwners",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Events_EventAdmins_AdminsID",
+                table: "Events",
+                column: "AdminsID",
+                principalTable: "EventAdmins",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Prerequisites_Puzzles_PrerequisiteID",
+                table: "Prerequisites",
+                column: "PrerequisiteID",
+                principalTable: "Puzzles",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Prerequisites_Puzzles_PuzzleID",
+                table: "Prerequisites",
+                column: "PuzzleID",
+                principalTable: "Puzzles",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+        }
+    }
+}
diff --git a/Data/Migrations/PuzzleServerContextModelSnapshot.cs b/Data/Migrations/PuzzleServerContextModelSnapshot.cs
index b994b32e..7408b5d0 100644
--- a/Data/Migrations/PuzzleServerContextModelSnapshot.cs
+++ b/Data/Migrations/PuzzleServerContextModelSnapshot.cs
@@ -15,7 +15,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.3-rtm-32065")
+                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
@@ -219,8 +219,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
-                    b.Property<int?>("AdminsID");
-
                     b.Property<bool>("AllowFeedback");
 
                     b.Property<DateTime>("AnswerSubmissionEnd");
@@ -264,8 +262,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("ID");
 
-                    b.HasIndex("AdminsID");
-
                     b.ToTable("Events");
                 });
 
@@ -281,7 +277,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("ID");
 
-                    b.HasIndex("Event.ID");
+                    b.HasIndex("Event.ID")
+                        .IsUnique()
+                        .HasFilter("[Event.ID] IS NOT NULL");
 
                     b.HasIndex("User.ID");
 
@@ -309,25 +307,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("EventAuthors");
                 });
 
-            modelBuilder.Entity("ServerCore.DataModel.EventOwners", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int?>("Event.ID");
-
-                    b.Property<int?>("User.ID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Event.ID");
-
-                    b.HasIndex("User.ID");
-
-                    b.ToTable("EventOwners");
-                });
-
             modelBuilder.Entity("ServerCore.DataModel.EventTeams", b =>
                 {
                     b.Property<int>("ID")
@@ -405,9 +384,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
-                    b.Property<int?>("PrerequisiteID");
+                    b.Property<int>("PrerequisiteID");
 
-                    b.Property<int?>("PuzzleID");
+                    b.Property<int>("PuzzleID");
 
                     b.HasKey("ID");
 
@@ -680,18 +659,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("ServerCore.DataModel.Event", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.EventAdmins", "Admins")
-                        .WithMany()
-                        .HasForeignKey("AdminsID");
-                });
-
             modelBuilder.Entity("ServerCore.DataModel.EventAdmins", b =>
                 {
-                    b.HasOne("ServerCore.DataModel.EventOwners", "Event")
-                        .WithMany()
-                        .HasForeignKey("Event.ID");
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithOne("Admins")
+                        .HasForeignKey("ServerCore.DataModel.EventAdmins", "Event.ID");
 
                     b.HasOne("ServerCore.DataModel.PuzzleUser", "Admin")
                         .WithMany()
@@ -709,17 +681,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("User.ID");
                 });
 
-            modelBuilder.Entity("ServerCore.DataModel.EventOwners", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Event", "Event")
-                        .WithMany()
-                        .HasForeignKey("Event.ID");
-
-                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Owner")
-                        .WithMany()
-                        .HasForeignKey("User.ID");
-                });
-
             modelBuilder.Entity("ServerCore.DataModel.EventTeams", b =>
                 {
                     b.HasOne("ServerCore.DataModel.Event", "Event")
@@ -753,11 +714,13 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.HasOne("ServerCore.DataModel.Puzzle", "Prerequisite")
                         .WithMany()
-                        .HasForeignKey("PrerequisiteID");
+                        .HasForeignKey("PrerequisiteID")
+                        .OnDelete(DeleteBehavior.Cascade);
 
                     b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
                         .WithMany()
-                        .HasForeignKey("PuzzleID");
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
                 });
 
             modelBuilder.Entity("ServerCore.DataModel.Puzzle", b =>
diff --git a/Data/PuzzleServerContext.cs b/Data/PuzzleServerContext.cs
index ecd9b3a3..1dc22100 100644
--- a/Data/PuzzleServerContext.cs
+++ b/Data/PuzzleServerContext.cs
@@ -18,7 +18,6 @@ public PuzzleServerContext(DbContextOptions<PuzzleServerContext> options)
         public DbSet<Event> Events { get; set; }
         public DbSet<EventAdmins> EventAdmins { get; set; }
         public DbSet<EventAuthors> EventAuthors { get; set; }
-        public DbSet<EventOwners> EventOwners { get; set; }
         public DbSet<EventTeams> EventTeams { get; set; }
         public DbSet<Feedback> Feedback { get; set; }
         public DbSet<Invitation> Invitations { get; set; }
diff --git a/ServerCore/AuthorDashboardHelper.cs b/ServerCore/AuthorDashboardHelper.cs
new file mode 100644
index 00000000..136db486
--- /dev/null
+++ b/ServerCore/AuthorDashboardHelper.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Linq;
+using ServerCore.DataModel;
+
+namespace ServerCore
+{
+    public class AuthorDashboardHelper
+    {
+        /// <summary>
+        /// Returns a list of the author's puzzles for the given event
+        /// </summary>
+        /// <param name="thisEvent">The event that's being checked</param>
+        /// <param name="puzzleServerContext">Current PuzzleServerContext</param>
+        public List<Puzzle> GetPuzzlesForAuthorAndEvent(PuzzleServerContext dbContext, PuzzleUser user, Event thisEvent)
+        {
+            return dbContext.PuzzleAuthors.Where(pa => pa.Author.ID == user.ID && pa.Puzzle.Event.ID == thisEvent.ID).Select(pa => pa.Puzzle).ToList();
+        }
+    }
+}
diff --git a/ServerCore/ServerCore.csproj b/ServerCore/ServerCore.csproj
index def46a3f..940e84ca 100644
--- a/ServerCore/ServerCore.csproj
+++ b/ServerCore/ServerCore.csproj
@@ -34,6 +34,8 @@
   <ItemGroup>
     <Folder Include="Areas\Identity\Data\" />
     <Folder Include="Content\" />
+    <Folder Include="Pages\Manage\" />
+    <Folder Include="Pages\Play\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Data\Data.csproj" />