This is currently being hung up by my schedule and my inability to squash these commits correctly. Might just have to start over :(