Initial Commit with Mostly-Working Code