Squashed commit of the following: Author: John Benediktsson <mrjbq7@gmail.com> Author: John Benediktsson <mrjbq7@gmail.com> Author: John Benediktsson <mrjbq7@gmail.com> Author: John Benediktsson <mrjbq7@gmail.com> Author: John Benediktsson <mrjbq7@gmail.com>