diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 1b43317..7b66ece 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.7.3-beta+739" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 294ae5d..49a5e9b 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.7.3-beta+739" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 75edcff..b92cc97 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.7.3-beta+739" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.9/122c7cee69b53ed4a7681c03d4ee4c0e2765da5/commons-lang3-3.9.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.9/122c7cee69b53ed4a7681c03d4ee4c0e2765da5/commons-lang3-3.9.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
diff --git a/build.gradle b/build.gradle
index 50b3de9..d9102a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,7 +88,7 @@ spotbugs {
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
     reports {
-        xml.enabled = false
+        xml.enabled = true
         html.enabled = true
     }
     excludeFilter.set(file("$projectDir/config/spotbugs/excludeFilter.xml"))
@@ -140,7 +140,7 @@ clean {
 }
 
 run {
-    args '--v'
+    //args '--v'
 }
 
 incrementBuildMeta {
diff --git a/config/spotbugs/excludeFilter.xml b/config/spotbugs/excludeFilter.xml
index 3d88834..49bdd81 100644
--- a/config/spotbugs/excludeFilter.xml
+++ b/config/spotbugs/excludeFilter.xml
@@ -6,7 +6,7 @@
     <Match>
         <Or>
             <Package name="net.thauvin.erik.mobibot.*"/>
-            <Package name="net.thauvin.erik.mobibot.tell.*"/>
+            <Package name="net.thauvin.erik.mobibot.commands.tell.*"/>
             <Package name="net.thauvin.erik.mobibot.entries.*"/>
         </Or>
         <Or>
@@ -21,7 +21,7 @@
             <Class name="net.thauvin.erik.mobibot.Mobibot"/>
             <Class name="net.thauvin.erik.mobibot.Pinboard"/>
             <Class name="net.thauvin.erik.mobibot.FeedReader"/>
-            <Class name="net.thauvin.erik.mobibot.tell.Tell"/>
+            <Class name="net.thauvin.erik.mobibot.commands.tell.Tell"/>
             <Package name="net.thauvin.erik.mobibot.modules.*"/>
             <Package name="net.thauvin.erik.mobibot.entries.*"/>
         </Or>
@@ -33,4 +33,7 @@
         <Bug pattern="PATH_TRAVERSAL_OUT"/>
         <Confidence value="1"/>
     </Match>
+    <Match>
+        <Source name="~.*\.kt"/>
+    </Match>
 </FindBugsFilter>
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index fee5cbc..2f5da4b 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -1,37 +1,23 @@
 <?xml version="1.0" ?>
-<!--
-  ~ detekt-baseline.xml
-  ~
-  ~ Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted provided that the following conditions are met:
-  ~
-  ~   Redistributions of source code must retain the above copyright notice, this
-  ~   list of conditions and the following disclaimer.
-  ~
-  ~   Redistributions in binary form must reproduce the above copyright notice,
-  ~   this list of conditions and the following disclaimer in the documentation
-  ~   and/or other materials provided with the distribution.
-  ~
-  ~   Neither the name of this project nor the names of its contributors may be
-  ~   used to endorse or promote products derived from this software without
-  ~   specific prior written permission.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  ~ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  ~ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  ~ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  ~ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  ~ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  ~ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  ~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-
 <SmellBaseline>
   <Blacklist></Blacklist>
-  <Whitelist></Whitelist>
+  <Whitelist>
+    <ID>ComplexMethod:Links.kt$Links$commandResponse</ID>
+    <ID>ComplexMethod:UrlMgr.kt$UrlMgr$commandResponse</ID>
+    <ID>ComplexMethod:View.kt$View$commandResponse</ID>
+    <ID>LongMethod:Links.kt$Links$commandResponse</ID>
+    <ID>LongMethod:UrlMgr.kt$UrlMgr$commandResponse</ID>
+    <ID>LongMethod:View.kt$View$commandResponse</ID>
+    <ID>LongParameterList:AbstractCommand.kt$AbstractCommand$( bot: Mobibot, sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
+    <ID>LoopWithTooManyJumpStatements:View.kt$View$while (i &lt; max) { entry = getEntry(i) if (lcArgs.isNotEmpty()) { if (entry.link.toLowerCase().contains(lcArgs) || entry.title.toLowerCase().contains(lcArgs) || entry.nick.toLowerCase().contains(lcArgs)) { if (sent &gt; maxEntries) { bot.send( sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"), isPrivate ) break } bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate) sent++ } } else { if (sent &gt; maxEntries) { bot.send( sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}"), isPrivate ) break } bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate) sent++ } i++ }</ID>
+    <ID>MagicNumber:Comments.kt$Comments$3</ID>
+    <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
+    <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
+    <ID>MagicNumber:View.kt$View$8</ID>
+    <ID>NestedBlockDepth:Comments.kt$Comments$commandResponse</ID>
+    <ID>NestedBlockDepth:Ignore.kt$Ignore$commandResponse</ID>
+    <ID>NestedBlockDepth:Links.kt$Links$commandResponse</ID>
+    <ID>NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse</ID>
+    <ID>NestedBlockDepth:View.kt$View$commandResponse</ID>
+  </Whitelist>
 </SmellBaseline>
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 0653d4b..3421c5d 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1585119580379L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1585416159853L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
-    public static final int MINOR = 7;
-    public static final int PATCH = 3;
-    public static final String PRERELEASE = "beta";
-    public static final String BUILDMETA = "760";
-    public static final String VERSION = "0.7.3-beta+760";
+    public static final int MINOR = 8;
+    public static final int PATCH = 0;
+    public static final String PRERELEASE = "alpha";
+    public static final String BUILDMETA = "045";
+    public static final String VERSION = "0.8.0-alpha+045";
 
     /**
      * Disables the default constructor.
diff --git a/src/main/java/net/thauvin/erik/mobibot/Commands.java b/src/main/java/net/thauvin/erik/mobibot/Commands.java
deleted file mode 100644
index 7bcdf43..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/Commands.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Commands.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot;
-
-/**
- * The <code>commands</code>, <code>keywords</code> and <code>arguments</code>.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-26
- * @since 1.0
- */
-public final class Commands {
-    /**
-     * The link command.
-     */
-    public static final String LINK_CMD = "L";
-    /**
-     * The view command.
-     */
-    public static final String VIEW_CMD = "view";
-    /**
-     * The add (back)log command.
-     */
-    static final String ADDLOG_CMD = "addlog";
-    /**
-     * The cycle command.
-     */
-    static final String CYCLE_CMD = "cycle";
-    /**
-     * Debug command line argument.
-     */
-    static final String DEBUG_ARG = "debug";
-    /**
-     * The debug command.
-     */
-    static final String DEBUG_CMD = "debug";
-    /**
-     * The die command.
-     */
-    static final String DIE_CMD = "die";
-    /**
-     * Help command line argument.
-     */
-    static final String HELP_ARG = "help";
-    /**
-     * The help command.
-     */
-    static final String HELP_CMD = "help";
-    /**
-     * The help on posting keyword.
-     */
-    static final String HELP_POSTING_KEYWORD = "posting";
-    /**
-     * The help on tags keyword.
-     */
-    static final String HELP_TAGS_KEYWORD = "tags";
-    /**
-     * The ignore command.
-     */
-    static final String IGNORE_CMD = "ignore";
-    /**
-     * The ignore <code>me</code> keyword.
-     */
-    static final String IGNORE_ME_KEYWORD = "me";
-    /**
-     * The info command.
-     */
-    static final String INFO_CMD = "info";
-    /**
-     * The me command.
-     */
-    static final String ME_CMD = "me";
-    /**
-     * The modules command.
-     */
-    static final String MODULES_CMD = "modules";
-    /**
-     * The msg command.
-     */
-    static final String MSG_CMD = "msg";
-    /**
-     * The nick command.
-     */
-    static final String NICK_CMD = "nick";
-    /**
-     * Properties command line argument.
-     */
-    static final String PROPS_ARG = "properties";
-    /**
-     * The recap command.
-     */
-    static final String RECAP_CMD = "recap";
-    /**
-     * The say command.
-     */
-    static final String SAY_CMD = "say";
-    /**
-     * The users command.
-     */
-    static final String USERS_CMD = "users";
-    /**
-     * Properties version line argument.
-     */
-    static final String VERSION_ARG = "version";
-    /**
-     * The version command.
-     */
-    static final String VERSION_CMD = "version";
-
-
-    /**
-     * Disables the default constructor.
-     *
-     * @throws UnsupportedOperationException If the constructor is called.
-     */
-    private Commands() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.java b/src/main/java/net/thauvin/erik/mobibot/Constants.java
index dd2cbaa..411c688 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.java
@@ -1,7 +1,7 @@
 /*
  * Constants.java
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,10 +42,38 @@ import java.util.Locale;
  * @since 1.0
  */
 public final class Constants {
+    /**
+     * The add (back)log command.
+     */
+    public static final String ADDLOG_CMD = "addlog";
     /**
      * The connect/read timeout in ms.
      */
     public static final int CONNECT_TIMEOUT = 5000;
+    /**
+     * Debug command line argument.
+     */
+    public static final String DEBUG_ARG = "debug";
+    /**
+     * The debug command.
+     */
+    public static final String DEBUG_CMD = "debug";
+    /**
+     * The die command.
+     */
+    public static final String DIE_CMD = "die";
+    /**
+     * Help command line argument.
+     */
+    public static final String HELP_ARG = "help";
+    /**
+     * The help command.
+     */
+    public static final String HELP_CMD = "help";
+    /**
+     * The link command.
+     */
+    public static final String LINK_CMD = "L";
     /**
      * Default locale.
      */
@@ -54,6 +82,10 @@ public final class Constants {
      * The empty title string.
      */
     public static final String NO_TITLE = "No Title";
+    /**
+     * Properties command line argument.
+     */
+    public static final String PROPS_ARG = "properties";
     /**
      * The timer delay in minutes.
      */
@@ -66,6 +98,10 @@ public final class Constants {
      * The Twitter handle property key.
      */
     public static final String TWITTER_HANDLE_PROP = "twitter-handle";
+    /**
+     * Properties version line argument.
+     */
+    public static final String VERSION_ARG = "version";
 
     /**
      * Disables the default constructor.
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 3db3c42..e695d4d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -32,11 +32,26 @@
 
 package net.thauvin.erik.mobibot;
 
-import com.rometools.rome.io.FeedException;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.thauvin.erik.mobibot.commands.AbstractCommand;
+import net.thauvin.erik.mobibot.commands.Cycle;
+import net.thauvin.erik.mobibot.commands.Ignore;
+import net.thauvin.erik.mobibot.commands.Info;
+import net.thauvin.erik.mobibot.commands.Me;
+import net.thauvin.erik.mobibot.commands.MobibotVersion;
+import net.thauvin.erik.mobibot.commands.Modules;
+import net.thauvin.erik.mobibot.commands.Msg;
+import net.thauvin.erik.mobibot.commands.Nick;
+import net.thauvin.erik.mobibot.commands.Recap;
+import net.thauvin.erik.mobibot.commands.Say;
+import net.thauvin.erik.mobibot.commands.Users;
+import net.thauvin.erik.mobibot.commands.links.Comment;
+import net.thauvin.erik.mobibot.commands.links.Posting;
+import net.thauvin.erik.mobibot.commands.links.Tags;
+import net.thauvin.erik.mobibot.commands.links.UrlMgr;
+import net.thauvin.erik.mobibot.commands.links.View;
+import net.thauvin.erik.mobibot.commands.tell.Tell;
 import net.thauvin.erik.mobibot.entries.EntriesMgr;
-import net.thauvin.erik.mobibot.entries.EntriesUtils;
-import net.thauvin.erik.mobibot.entries.EntryComment;
 import net.thauvin.erik.mobibot.entries.EntryLink;
 import net.thauvin.erik.mobibot.modules.AbstractModule;
 import net.thauvin.erik.mobibot.modules.Calc;
@@ -54,7 +69,6 @@ import net.thauvin.erik.mobibot.modules.War;
 import net.thauvin.erik.mobibot.modules.Weather2;
 import net.thauvin.erik.mobibot.modules.WorldTime;
 import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.tell.Tell;
 import net.thauvin.erik.semver.Version;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -63,15 +77,13 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.Configurator;
-import org.jibble.pircbot.Colors;
 import org.jibble.pircbot.PircBot;
 import org.jibble.pircbot.User;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -79,22 +91,16 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
-import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.time.Clock;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
-import java.util.StringTokenizer;
 import java.util.Timer;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 /**
@@ -108,52 +114,44 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 @Version(properties = "version.properties",
          className = "ReleaseInfo")
 public class Mobibot extends PircBot {
-
+    // Info strings
+    @SuppressWarnings("indentation")
+    public static final List<String> INFO =
+            List.of(ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION + " by Erik C. Thauvin (erik@thauvin.net)",
+                    "https://www.mobitopia.org/mobibot/");
+    // Version strings
+    @SuppressWarnings("indentation")
+    public static final List<String> MOBIBOT_VERSIONS =
+            List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
+                    "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
+                    + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
+                    "Runtime: " + System.getProperty("java.runtime.name") + " (build " + System.getProperty(
+                            "java.runtime.version") + ')',
+                    "VM: " + System.getProperty("java.vm.name") + " (build " + System.getProperty("java.vm.version")
+                    + ", "
+                    + System.getProperty("java.vm.info") + ')');
+    // Timer
+    public static final Timer timer = new Timer(true);
     // Default port
     private static final int DEFAULT_PORT = 6667;
     // Default server
     private static final String DEFAULT_SERVER = "irc.freenode.net";
-    // Info strings
-    @SuppressWarnings("indentation")
-    private static final String[] INFO_STRS = {
-            ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION + " by Erik C. Thauvin (erik@thauvin.net)",
-            "https://www.mobitopia.org/mobibot/" };
-    // Link match string
-    private static final String LINK_MATCH = "^[hH][tT][tT][pP](|[sS])://.*";
-    // Default maximum number of entries to display
-    private static final int MAX_ENTRIES = 8;
-    // Default maximum recap entries
-    private static final int MAX_RECAP = 10;
     // Maximum number of times the bot will try to reconnect, if disconnected
     private static final int MAX_RECONNECT = 10;
     // Number of milliseconds to delay between consecutive messages
     private static final long MESSAGE_DELAY = 1000L;
-    // Modules
-    private static final List<AbstractModule> MODULES = new ArrayList<>(0);
-    // Tags/categories marker
-    private static final String TAGS_MARKER = "tags:";
-    // Version strings
-    @SuppressWarnings("indentation")
-    private static final String[] VERSION_STRS =
-            { "Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
-              "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
-              + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
-              "Runtime: " + System.getProperty("java.runtime.name") + " (build " + System.getProperty(
-                      "java.runtime.version") + ')',
-              "VM: " + System.getProperty("java.vm.name") + " (build " + System.getProperty("java.vm.version") + ", "
-              + System.getProperty("java.vm.info") + ')' };
     // Logger
     private static final Logger logger = LogManager.getLogger(Mobibot.class);
-    // Timer
-    private static final Timer timer = new Timer(true);
-    // Commands list
-    private final List<String> commandsList = new ArrayList<>();
-    // Entries array
-    private final List<EntryLink> entries = new ArrayList<>(0);
-    // History/backlogs array
-    private final List<String> history = new ArrayList<>(0);
-    // Ignored nicks array
-    private final Set<String> ignoredNicks = new HashSet<>(0);
+    // Ignore command
+    public final Ignore ignoreCommand;
+    // Automatically post links to Twitter
+    public final boolean isTwitterAutoPost;
+    // Tell object
+    public final Tell tell;
+    // Commands
+    private final List<AbstractCommand> commands = new ArrayList<>();
+    // Commands Names
+    private final List<String> commandsNames = new ArrayList<>();
     // Main channel
     private final String ircChannel;
     // IRC port
@@ -164,24 +162,22 @@ public class Mobibot extends PircBot {
     private final Level loggerLevel;
     // Log directory
     private final String logsDir;
-    // Recap array
-    private final List<String> recap = new ArrayList<>(0);
-    // Tags keywords matches
-    private final List<String> tagsKeywords = new ArrayList<>();
-    // Tell object
-    private final Tell tell;
-    // The Twitter auto-posts list.
-    private final List<Integer> twitterAutoLinks = new ArrayList<>();
-    // Automatically post links to Twitter
-    private final boolean twitterAutoPost;
+    // Modules
+    private final List<AbstractModule> modules = new ArrayList<>(0);
+    // Modules
+    private final List<String> modulesNames = new ArrayList<>(0);
+    // Operators commands names
+    private final List<String> opsCommandsNames = new ArrayList<>();
+    // Today's date
+    private final String today = Utils.today();
+    // Twitter auto-posts.
+    private final Set<Integer> twitterEntries = new HashSet<>();
     // Twitter handle for channel join notifications
     private final String twitterHandle;
     // Twitter module
     private final Twitter twitterModule;
     // Backlogs URL
     private String backLogsUrl = "";
-    // Default tags/categories
-    private String defaultTags = "";
     // Feed URL
     private String feedUrl = "";
     // Ident message
@@ -192,8 +188,6 @@ public class Mobibot extends PircBot {
     private String identPwd = "";
     // Pinboard posts handler
     private Pinboard pinboard;
-    // Today's date
-    private String today = Utils.today();
     // Weblog URL
     private String weblogUrl = "";
 
@@ -222,34 +216,16 @@ public class Mobibot extends PircBot {
         // Set the logger level
         loggerLevel = logger.getLevel();
 
-        // Load the current entries, if any
+        // Load the current entries and backlogs, if any
         try {
-            today = EntriesMgr.loadEntries(logsDir + EntriesMgr.CURRENT_XML, ircChannel, entries);
+            UrlMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, ircChannel);
 
             if (logger.isDebugEnabled()) {
-                logger.debug("Last feed: {}", today);
+                logger.debug("Last feed: {}", UrlMgr.getToday());
             }
-
-            if (!Utils.today().equals(today)) {
-                entries.clear();
-                today = Utils.today();
-            }
-        } catch (IOException ignore) {
-            // Do nothing
-        } catch (FeedException e) {
+        } catch (Exception e) {
             if (logger.isErrorEnabled()) {
-                logger.error("An error occurred while parsing the '" + EntriesMgr.CURRENT_XML + "' file.", e);
-            }
-        }
-
-        // Load the backlogs, if any
-        try {
-            EntriesMgr.loadBacklogs(logsDir + EntriesMgr.NAV_XML, history);
-        } catch (IOException ignore) {
-            // Do nothing
-        } catch (FeedException e) {
-            if (logger.isErrorEnabled()) {
-                logger.error("An error occurred while parsing the '" + EntriesMgr.NAV_XML + "' file.", e);
+                logger.error("An error occurred while loading the logs.", e);
             }
         }
 
@@ -269,28 +245,53 @@ public class Mobibot extends PircBot {
         // Set the pinboard authentication
         setPinboardAuth(p.getProperty("pinboard-api-token"));
 
+        // Set the ignored nicks
+        ignoreCommand = new Ignore(p.getProperty("ignore", ""));
+
+        // Load the commands
+        commands.add(new Cycle());
+        commands.add(ignoreCommand);
+        commands.add(new Info());
+        commands.add(new Me());
+        commands.add(new MobibotVersion());
+        commands.add(new Modules());
+        commands.add(new Msg());
+        commands.add(new Nick());
+        commands.add(new Recap());
+        commands.add(new Say());
+        commands.add(new Users());
+
+        // Load the links commands
+        commands.add(new Comment());
+        commands.add(new Posting());
+        commands.add(new Tags());
+        commands.add(new UrlMgr(p.getProperty("tags", ""), p.getProperty("tags-keywords", "")));
+        commands.add(new View());
+
+
         // Load the modules
-        MODULES.add(new Calc());
-        MODULES.add(new CurrencyConverter());
-        MODULES.add(new Dice());
-        MODULES.add(new GoogleSearch());
-        MODULES.add(new Joke());
-        MODULES.add(new Lookup());
-        MODULES.add(new Ping());
-        MODULES.add(new RockPaperScissors());
-        MODULES.add(new StockQuote());
+        addModule(new Calc());
+        addModule(new CurrencyConverter());
+        addModule(new Dice());
+        addModule(new GoogleSearch());
+        addModule(new Joke());
+        addModule(new Lookup());
+        addModule(new Ping());
+        addModule(new RockPaperScissors());
+        addModule(new StockQuote());
 
         twitterModule = new Twitter();
-        MODULES.add(twitterModule);
+        addModule(twitterModule);
         twitterHandle = p.getProperty(Constants.TWITTER_HANDLE_PROP, "");
-        twitterAutoPost = Boolean.parseBoolean(p.getProperty(Constants.TWITTER_AUTOPOST_PROP, "false"));
-
-        MODULES.add(new War());
-        MODULES.add(new Weather2());
-        MODULES.add(new WorldTime());
+        isTwitterAutoPost =
+                Boolean.parseBoolean(p.getProperty(Constants.TWITTER_AUTOPOST_PROP, "false"))
+                && twitterModule.isEnabled();
+        addModule(new War());
+        addModule(new Weather2());
+        addModule(new WorldTime());
 
         // Load the modules properties
-        MODULES.stream().filter(AbstractModule::hasProperties).forEach(module -> {
+        modules.stream().filter(AbstractModule::hasProperties).forEach(module -> {
             for (final String s : module.getPropertyKeys()) {
                 module.setProperty(s, p.getProperty(s, ""));
             }
@@ -299,15 +300,8 @@ public class Mobibot extends PircBot {
         // Get the tell command settings
         tell = new Tell(this, p.getProperty("tell-max-days"), p.getProperty("tell-max-size"));
 
-        // Set the tags
-        setTags(p.getProperty("tags", ""));
-        setTagsKeywords(p.getProperty("tags-keywords", ""));
-
-        // Set the ignored nicks
-        setIgnoredNicks(p.getProperty("ignore", ""));
-
         // Save the entries
-        saveEntries(true);
+        UrlMgr.saveEntries(this, true);
     }
 
     /**
@@ -323,18 +317,18 @@ public class Mobibot extends PircBot {
     public static void main(final String[] args) {
         // Setup the command line options
         final Options options = new Options()
-                                        .addOption(Commands.HELP_ARG.substring(0, 1),
-                                                   Commands.HELP_ARG,
+                                        .addOption(Constants.HELP_ARG.substring(0, 1),
+                                                   Constants.HELP_ARG,
                                                    false,
                                                    "print this help message")
-                                        .addOption(Commands.DEBUG_ARG.substring(0, 1), Commands.DEBUG_ARG, false,
+                                        .addOption(Constants.DEBUG_ARG.substring(0, 1), Constants.DEBUG_ARG, false,
                                                    "print debug & logging data directly to the console")
-                                        .addOption(Option.builder(Commands.PROPS_ARG.substring(0, 1)).hasArg()
+                                        .addOption(Option.builder(Constants.PROPS_ARG.substring(0, 1)).hasArg()
                                                          .argName("file")
                                                          .desc("use " + "alternate properties file")
-                                                         .longOpt(Commands.PROPS_ARG).build())
-                                        .addOption(Commands.VERSION_ARG.substring(0, 1),
-                                                   Commands.VERSION_ARG,
+                                                         .longOpt(Constants.PROPS_ARG).build())
+                                        .addOption(Constants.VERSION_ARG.substring(0, 1),
+                                                   Constants.VERSION_ARG,
                                                    false,
                                                    "print version info");
 
@@ -350,18 +344,18 @@ public class Mobibot extends PircBot {
             System.exit(1);
         }
 
-        if (line.hasOption(Commands.HELP_ARG.charAt(0))) {
+        if (line.hasOption(Constants.HELP_ARG.charAt(0))) {
             // Output the usage
             new HelpFormatter().printHelp(Mobibot.class.getName(), options);
-        } else if (line.hasOption(Commands.VERSION_ARG.charAt(0))) {
-            for (final String s : INFO_STRS) {
+        } else if (line.hasOption(Constants.VERSION_ARG.charAt(0))) {
+            for (final String s : INFO) {
                 System.out.println(s);
             }
         } else {
             final Properties p = new Properties();
 
             try (final InputStream fis = Files.newInputStream(
-                    Paths.get(line.getOptionValue(Commands.PROPS_ARG.charAt(0), "./mobibot.properties")))) {
+                    Paths.get(line.getOptionValue(Constants.PROPS_ARG.charAt(0), "./mobibot.properties")))) {
                 // Load the properties files
                 p.load(fis);
             } catch (FileNotFoundException e) {
@@ -379,7 +373,7 @@ public class Mobibot extends PircBot {
             final String logsDir = Utils.ensureDir(p.getProperty("logs", "."), false);
 
             // Redirect the stdout and stderr
-            if (!line.hasOption(Commands.DEBUG_ARG.charAt(0))) {
+            if (!line.hasOption(Constants.DEBUG_ARG.charAt(0))) {
                 try {
                     final PrintStream stdout = new PrintStream(
                             new FileOutputStream(logsDir + channel.substring(1) + '.' + Utils.today() + ".log", true));
@@ -408,19 +402,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Sleeps for the specified number of seconds.
-     *
-     * @param secs The number of seconds to sleep for.
-     */
-    private static void sleep(final int secs) {
-        try {
-            Thread.sleep(secs * 1000L);
-        } catch (InterruptedException ignore) {
-            // Do nothing
-        }
-    }
-
     /**
      * Sends an action to the current channel.
      *
@@ -442,6 +423,27 @@ public class Mobibot extends PircBot {
         }
     }
 
+    /**
+     * Adds a module.
+     *
+     * @param module The module to add.
+     */
+    private void addModule(final AbstractModule module) {
+        modules.add(module);
+        modulesNames.add(module.getClass().getSimpleName());
+    }
+
+    /**
+     * Adds pin on pinboard.
+     *
+     * @param entry The entry to add.
+     */
+    public final void addPin(final EntryLink entry) {
+        if (pinboard != null) {
+            pinboard.addPost(entry);
+        }
+    }
+
     /**
      * Connects to the server and joins the channel.
      */
@@ -470,14 +472,22 @@ public class Mobibot extends PircBot {
                 }
             }
         }
-
-        setVersion(INFO_STRS[0]);
-
+        setVersion(INFO.get(0));
         identify();
-
         joinChannel();
     }
 
+    /**
+     * Deletes pin on pinboard.
+     *
+     * @param entry The entry to delete.
+     */
+    public final void deletePin(final EntryLink entry) {
+        if (pinboard != null) {
+            pinboard.deletePost(entry);
+        }
+    }
+
     /**
      * Responds with the title and links from the RSS feed.
      *
@@ -491,24 +501,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Returns the index of the specified duplicate entry, if any.
-     *
-     * @param link The link.
-     * @return The index or -1 if none.
-     */
-    private int findDupEntry(final String link) {
-        synchronized (entries) {
-            for (int i = 0; i < entries.size(); i++) {
-                if (link.equals(entries.get(i).getLink())) {
-                    return i;
-                }
-            }
-        }
-
-        return -1;
-    }
-
     /**
      * Returns the backlogs URL.
      *
@@ -564,6 +556,15 @@ public class Mobibot extends PircBot {
         return logsDir;
     }
 
+    /**
+     * Returns the enabled modules names.
+     *
+     * @return The modules names.
+     */
+    public final List<String> getModulesNames() {
+        return modulesNames;
+    }
+
     /**
      * Returns the bot's nickname regexp pattern.
      *
@@ -603,159 +604,114 @@ public class Mobibot extends PircBot {
     }
 
     /**
-     * Returns indented and bold help string.
+     * Responds with the commands help, if any.
      *
-     * @param help The help string.
-     * @return The indented help string.
+     * @param sender The nick of the person requesting Constants.
+     * @param topic  The help topic.
+     * @return {@code true} if the topic was found, {@code false} otherwise.
      */
-    public final String helpIndent(final String help) {
-        return helpIndent(help, true);
+    private boolean helpCommands(final String sender, final String topic) {
+        for (final AbstractCommand command : commands) {
+            if (command.isVisible() && command.getCommand().startsWith(topic)) {
+                return command.helpResponse(this, topic, sender, isOp(sender), true);
+            }
+        }
+        return false;
     }
 
     /**
-     * Returns indented help string.
+     * Responds with the default Constants.
      *
-     * @param help   The help string.
-     * @param isBold The bold flag.
-     * @return The indented help string.
+     * @param sender The nick of the person requesting Constants.
+     * @param isOp   The channel operator flag.
      */
-    public String helpIndent(final String help, final boolean isBold) {
-        return "        " + (isBold ? bold(help) : help);
+    public void helpDefault(final String sender, final boolean isOp) {
+        send(sender, Utils.bold("Type a URL on " + ircChannel + " to post it."));
+        send(sender, "For more information on a specific command, type:");
+        send(sender, Utils.helpIndent(getNick() + ": " + Constants.HELP_CMD + " <command>"));
+        send(sender, Utils.bold("The commands are:"));
+
+        if (commandsNames.isEmpty()) {
+            // Feed command
+            commandsNames.add(getChannelName());
+
+            // Commands
+            for (final AbstractCommand command : commands) {
+                if (command.isVisible()) {
+                    if (command.isOp()) {
+                        opsCommandsNames.add(command.getCommand());
+                    } else {
+                        commandsNames.add(command.getCommand());
+                    }
+                }
+            }
+
+            // Modules commands
+            modules.stream().filter(AbstractModule::isEnabled)
+                   .forEach(module -> commandsNames.addAll(module.getCommands()));
+
+            // Tell command
+            if (tell.isEnabled()) {
+                commandsNames.add(Tell.TELL_CMD);
+            }
+
+            Collections.sort(commandsNames);
+            Collections.sort(opsCommandsNames);
+        }
+
+        // Print 6 commands per line
+        final int chunk = 6;
+        for (int i = 0; i < commandsNames.size(); i += chunk) {
+            send(sender, Utils.helpIndent(
+                    String.join(" ", commandsNames.subList(i, Math.min(commandsNames.size(), i + chunk)))));
+        }
+
+        if (isOp) {
+            send(sender, Utils.bold("The op commands are:"));
+            send(sender, Utils.helpIndent(String.join(" ", opsCommandsNames)));
+        }
     }
 
     /**
-     * Responds with the bot's help.
+     * Responds with the modules help, if any.
+     *
+     * @param sender The nick of the person requesting Constants.
+     * @param topic  The help topic.
+     * @return {@code true} if the topic was found, {@code false} otherwise.
+     */
+    private boolean helpModules(final String sender, final String topic) {
+        for (final AbstractModule module : modules) {
+            for (final String cmd : module.getCommands()) {
+                if (topic.equals(cmd)) {
+                    module.helpResponse(this, sender, topic, true);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Responds with the bot's Constants.
      *
      * @param sender The nick of the person who sent the private message.
      * @param topic  The help topic, if any.
      */
     private void helpResponse(final String sender, final String topic) {
-        final String lcTopic = topic.toLowerCase(Constants.LOCALE).trim();
-
-        if (Commands.HELP_POSTING_KEYWORD.equals(lcTopic)) {
-            send(sender, bold("Post a URL, by saying it on a line on its own:"));
-            send(sender, helpIndent("<url> [<title>] [" + TAGS_MARKER + "<+tag> [...]]"));
-            send(sender, "I will reply with a label, for example: " + bold(Commands.LINK_CMD + '1'));
-            send(sender, "To add a title, use a its label and a pipe:");
-            send(sender, helpIndent(Commands.LINK_CMD + "1:|This is the title"));
-            send(sender, "To add a comment: ");
-            send(sender, helpIndent(Commands.LINK_CMD + "1:This is a comment"));
-            send(sender, "I will reply with a label, for example: " + bold(Commands.LINK_CMD + "1.1"));
-            send(sender, "To edit a comment, use its label: ");
-            send(sender, helpIndent(Commands.LINK_CMD + "1.1:This is an edited comment"));
-            send(sender, "To delete a comment, use its label and a minus sign: ");
-            send(sender, helpIndent(Commands.LINK_CMD + "1.1:-"));
-            send(sender, "You can also view a posting by saying its label.");
-        } else if (Commands.HELP_TAGS_KEYWORD.equals(lcTopic)) {
-            send(sender, bold("To categorize or tag a URL, use its label and a T:"));
-            send(sender, helpIndent(Commands.LINK_CMD + "1T:<+tag|-tag> [...]"));
-        } else if (Commands.VIEW_CMD.equals(lcTopic)) {
-            send(sender, "To list or search the current URL posts:");
-            send(sender, helpIndent(getNick() + ": " + Commands.VIEW_CMD) + " [<start>] [<query>]");
-        } else if (lcTopic.equalsIgnoreCase(getChannelName())) {
-            send(sender, "To list the last 5 posts from the channel's weblog:");
-            send(sender, helpIndent(getNick() + ": " + getChannelName()));
-        } else if (Commands.RECAP_CMD.equals(lcTopic)) {
-            send(sender, "To list the last 10 public channel messages:");
-            send(sender, helpIndent(getNick() + ": " + Commands.RECAP_CMD));
-        } else if (Commands.USERS_CMD.equals(lcTopic)) {
-            send(sender, "To list the users present on the channel:");
-            send(sender, helpIndent(getNick() + ": " + Commands.USERS_CMD));
-        } else if (Commands.INFO_CMD.equals(lcTopic)) {
-            send(sender, "To view information about the bot:");
-            send(sender, helpIndent(getNick() + ": " + Commands.INFO_CMD));
+        final boolean isOp = isOp(sender);
+        if (StringUtils.isBlank(topic)) {
+            helpDefault(sender, isOp);
         } else {
-            final String msg = "/msg ";
-            if (Commands.CYCLE_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To have the bot leave the channel and come back:");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.CYCLE_CMD));
-            } else if (Commands.ME_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To have the bot perform an action:");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.ME_CMD + " <action>"));
-            } else if (Commands.SAY_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To have the bot say something on the channel:");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.SAY_CMD + " <text>"));
-            } else if (Commands.VERSION_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To view the version data (bot, java, etc.):");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.VERSION_CMD));
-            } else if (Commands.MSG_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To have the bot send a private message to someone:");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.MSG_CMD + " <nick> <text>"));
-            } else if (Commands.IGNORE_CMD.equals(lcTopic)) {
-                send(sender, "To check your ignore status:");
-                send(sender, helpIndent(getNick() + ": " + Commands.IGNORE_CMD));
-
-                send(sender, "To toggle your ignore status:");
-                send(sender, helpIndent(getNick() + ": " + Commands.IGNORE_CMD + ' ' + Commands.IGNORE_ME_KEYWORD));
+            final String lcTopic = topic.toLowerCase(Constants.LOCALE).trim();
+            if (lcTopic.equals(getChannelName())) {
+                send(sender, Utils.bold("To list the last 5 posts from the channel's weblog:"));
+                send(sender, Utils.helpIndent(getNick() + ": " + getChannelName()));
             } else if (Tell.TELL_CMD.equals(lcTopic) && tell.isEnabled()) {
                 tell.helpResponse(sender);
             } else {
-                for (final AbstractModule module : MODULES) {
-                    for (final String cmd : module.getCommands()) {
-                        if (lcTopic.equals(cmd)) {
-                            module.helpResponse(this, sender, topic, true);
-                            return;
-                        }
-                    }
-                }
-
-                send(sender, bold("Type a URL on " + ircChannel + " to post it."));
-                send(sender, "For more information on a specific command, type:");
-                send(sender, helpIndent(getNick() + ": " + Commands.HELP_CMD + " <command>"));
-                send(sender, "The commands are:");
-
-                if (commandsList.isEmpty()) {
-                    commandsList.add(Commands.IGNORE_CMD);
-                    commandsList.add(Commands.INFO_CMD);
-                    commandsList.add(getChannelName());
-                    commandsList.add(Commands.HELP_POSTING_KEYWORD);
-                    commandsList.add(Commands.HELP_TAGS_KEYWORD);
-                    commandsList.add(Commands.RECAP_CMD);
-                    commandsList.add(Commands.USERS_CMD);
-                    commandsList.add(Commands.VIEW_CMD);
-
-                    MODULES.stream().filter(AbstractModule::isEnabled)
-                           .forEach(module -> commandsList.addAll(module.getCommands()));
-
-                    if (tell.isEnabled()) {
-                        commandsList.add(Tell.TELL_CMD);
-                    }
-
-                    Collections.sort(commandsList);
-                }
-
-                final StringBuilder sb = new StringBuilder(0);
-
-                for (int i = 0, cmdCount = 1; i < commandsList.size(); i++, cmdCount++) {
-                    if (sb.length() > 0) {
-                        sb.append("  ");
-                    }
-
-                    sb.append(commandsList.get(i));
-
-                    // 6 commands per line or last command
-                    if (sb.length() > 0 && (cmdCount == 6 || i == (commandsList.size() - 1))) {
-                        send(sender, helpIndent(sb.toString()));
-
-                        sb.setLength(0);
-                        cmdCount = 0;
-                    }
-                }
-
-                if (isOp(sender)) {
-                    send(sender, "The op commands are:");
-                    send(sender,
-                         helpIndent(Commands.CYCLE_CMD
-                                    + "  "
-                                    + Commands.ME_CMD
-                                    + "  "
-                                    + Commands.MODULES_CMD
-                                    + "  "
-                                    + Commands.MSG_CMD
-                                    + "  "
-                                    + Commands.SAY_CMD
-                                    + "  "
-                                    + Commands.VERSION_CMD));
+                // Command, Modules or Default
+                if (!helpCommands(sender, topic) && !helpModules(sender, lcTopic)) {
+                    helpDefault(sender, isOp);
                 }
             }
         }
@@ -776,98 +732,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Processes the {@link net.thauvin.erik.mobibot.Commands#IGNORE_CMD} command.
-     *
-     * @param sender The sender.
-     * @param args   The command arguments.
-     */
-    private void ignoreResponse(final String sender, final String args) {
-        if (!isOp(sender)) {
-            final String nick = sender.toLowerCase(Constants.LOCALE);
-            final boolean isMe = args.toLowerCase(Constants.LOCALE).startsWith(Commands.IGNORE_ME_KEYWORD);
-            if (isMe) {
-                if (ignoredNicks.remove(nick)) {
-                    send(sender, "You are no longer ignored.");
-                } else {
-                    ignoredNicks.add(nick);
-                    send(sender, "You are now ignored.");
-                }
-            } else {
-                if (ignoredNicks.contains(nick)) {
-                    send(sender, "You are currently ignored.");
-                } else {
-                    send(sender, "You are not currently ignored.");
-                }
-            }
-        } else {
-            if (args.length() > 0) {
-                final String[] nicks = args.toLowerCase(Constants.LOCALE).split(" ");
-
-                for (final String nick : nicks) {
-                    final String ignore;
-
-                    if (Commands.IGNORE_ME_KEYWORD.equals(nick)) {
-                        ignore = sender.toLowerCase(Constants.LOCALE);
-                    } else {
-                        ignore = nick;
-                    }
-
-                    if (!ignoredNicks.remove(ignore)) {
-                        ignoredNicks.add(ignore);
-                    }
-                }
-            }
-
-            send(sender, "The following nicks are ignored: " + ignoredNicks);
-        }
-    }
-
-    /**
-     * Responds with the bot's information.
-     *
-     * @param sender    The nick of the person who sent the message.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    private void infoResponse(final String sender, final boolean isPrivate) {
-        for (final String info : INFO_STRS) {
-            if (info.startsWith("https://")) {
-                send(sender, info, Colors.DARK_GREEN, isPrivate);
-            } else {
-                send(sender, info, isPrivate);
-            }
-        }
-
-        final StringBuilder info = new StringBuilder(29);
-
-        info.append("Uptime: ").append(Utils.uptime(ManagementFactory.getRuntimeMXBean().getUptime())).append(
-                " [Entries: ").append(entries.size());
-
-        if (isOp(sender)) {
-            if (tell.isEnabled()) {
-                info.append(", Messages: ").append(tell.size());
-            }
-
-            if (twitterAutoPost && twitterModule.isEnabled()) {
-                info.append(", Twitter: ").append(twitterAutoLinks.size());
-            }
-        }
-
-        info.append(", Recap: ").append(recap.size()).append(']');
-
-        send(sender, info.toString(), isPrivate);
-    }
-
-    /**
-     * Determines whether the specified nick should be ignored.
-     *
-     * @param nick The nick.
-     * @return <code>true</code> if the nick should be ignored, <code>false</code> otherwise.
-     */
-    private boolean isIgnoredNick(final String nick) {
-        return isNotBlank(nick) && ignoredNicks.contains(nick.toLowerCase(Constants.LOCALE));
-    }
-
     /**
      * Returns <code>true</code> if the specified sender is an Op on the {@link #ircChannel channel}.
      *
@@ -902,9 +766,7 @@ public class Mobibot extends PircBot {
         if (isNotBlank(weblogUrl)) {
             setVersion(weblogUrl);
         }
-
         sleep(5);
-
         connect();
     }
 
@@ -922,100 +784,7 @@ public class Mobibot extends PircBot {
 
         boolean isCommand = false;
 
-        // Capture URLs posted on the channel
-        if (message.matches(LINK_MATCH) && !isIgnoredNick(sender)) {
-            isCommand = true;
-
-            final String[] cmds = message.split(" ", 2);
-
-            if (cmds.length == 1 || (!cmds[1].contains(getNick()))) {
-                final String link = cmds[0].trim();
-                boolean isBackup = false;
-
-                final int dupIndex = findDupEntry(link);
-
-                if (dupIndex == -1) {
-                    if (!Utils.today().equals(today)) {
-                        isBackup = true;
-                        saveEntries(true);
-
-                        entries.clear();
-                        today = Utils.today();
-                    }
-
-                    final StringBuilder tags = new StringBuilder(defaultTags);
-                    String title = Constants.NO_TITLE;
-
-                    if (cmds.length == 2) {
-                        final String[] data = cmds[1].trim().split(TAGS_MARKER, 2);
-
-                        if (data.length == 1) {
-                            title = data[0].trim();
-                        } else {
-                            if (isNotBlank(data[0])) {
-                                title = data[0].trim();
-                            }
-
-                            tags.append(' ').append(data[1].trim());
-                        }
-                    }
-
-                    if (Constants.NO_TITLE.equals(title)) {
-                        try {
-                            final Document html = Jsoup.connect(link).userAgent("Mozilla").get();
-                            final String htmlTitle = html.title();
-
-                            if (isNotBlank(htmlTitle)) {
-                                final String[] split = htmlTitle.split("( \\| )", 2);
-                                if (split.length == 2) {
-                                    title = split[0];
-                                } else {
-                                    title = htmlTitle;
-                                }
-                            }
-                        } catch (IOException ignore) {
-                            // Do nothing
-                        }
-                    }
-
-                    if (!tagsKeywords.isEmpty()) {
-                        for (final String match : tagsKeywords) {
-                            final String m = match.trim();
-                            if (title.matches("(?i).*\\b" + m + "\\b.*")) {
-                                tags.append(' ').append(m);
-                            }
-                        }
-                    }
-
-                    entries.add(new EntryLink(link, title, sender, login, channel, tags.toString()));
-
-                    final int index = entries.size() - 1;
-                    final EntryLink entry = entries.get(index);
-                    send(channel, EntriesUtils.buildLink(index, entry));
-
-                    // Add link to pinboard
-                    if (pinboard != null) {
-                        pinboard.addPost(entry);
-                    }
-
-                    // Queue link for posting to twitter
-                    if (twitterAutoPost && twitterModule.isEnabled()) {
-                        twitterAutoLinks.add(index);
-                        timer.schedule(new TwitterTimer(this, index), Constants.TIMER_DELAY * 60L * 1000L);
-                    }
-
-                    saveEntries(isBackup);
-
-                    if (Constants.NO_TITLE.equals(entry.getTitle())) {
-                        send(sender, "Please specify a title, by typing:", true);
-                        send(sender, helpIndent(Commands.LINK_CMD + (index + 1) + ":|This is the title"), true);
-                    }
-                } else {
-                    final EntryLink entry = entries.get(dupIndex);
-                    send(sender, bold("Duplicate") + " >> " + EntriesUtils.buildLink(dupIndex, entry));
-                }
-            }
-        } else if (message.matches(getNickPattern() + ":.*")) { // mobibot: <command>
+        if (message.matches(getNickPattern() + ":.*")) { // mobibot: <command>
             isCommand = true;
 
             final String[] cmds = message.substring(message.indexOf(':') + 1).trim().split(" ", 2);
@@ -1027,209 +796,47 @@ public class Mobibot extends PircBot {
                 args = cmds[1].trim();
             }
 
-            if (cmd.startsWith(Commands.HELP_CMD)) { // mobibot: help
+            if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
                 helpResponse(sender, args);
-            } else if (Commands.RECAP_CMD.equals(cmd)) { // mobibot: recap
-                recapResponse(sender, false);
-            } else if (Commands.USERS_CMD.equals(cmd)) { // mobibot: users
-                usersResponse(sender, false);
-            } else if (Commands.INFO_CMD.equals(cmd)) { // mobibot: info
-                infoResponse(sender, false);
-            } else if (Commands.VERSION_CMD.equals(cmd)) { // mobbiot: version
-                versionResponse(sender, false);
             } else if (cmd.equalsIgnoreCase(getChannelName())) { // mobibot: <channel>
                 feedResponse(sender);
-            } else if (cmd.startsWith(Commands.VIEW_CMD)) { // mobibot: view
-                viewResponse(sender, args, false);
             } else if (cmd.startsWith(Tell.TELL_CMD) && tell.isEnabled()) { // mobibot: tell
                 tell.response(sender, args);
-            } else if (cmd.startsWith(Commands.IGNORE_CMD)) { // mobibot: ignore
-                ignoreResponse(sender, args);
             } else {
-                for (final AbstractModule module : MODULES) { // modules
-                    for (final String c : module.getCommands()) {
-                        if (cmd.startsWith(c)) {
-                            module.commandResponse(this, sender, cmd, args, false);
+                boolean skip = false;
+                // Commands
+                for (final AbstractCommand command : commands) {
+                    if (command.isPublic() && command.getCommand().startsWith(cmd)) {
+                        command.commandResponse(this, sender, login, args, isOp(sender), false);
+                        skip = true;
+                        break;
+                    }
+                }
+                if (!skip) {
+                    // Modules
+                    for (final AbstractModule module : modules) { // modules
+                        for (final String c : module.getCommands()) {
+                            if (cmd.startsWith(c)) {
+                                module.commandResponse(this, sender, cmd, args, false);
+                                break;
+                            }
                         }
                     }
                 }
             }
-        } else if (message.matches(Commands.LINK_CMD + "[0-9]+:.*")) { // L1:<comment>, L1:-, L1:|<title>, etc
-            isCommand = true;
-
-            final String[] cmds = message.substring(1).split(":", 2);
-            final int index = Integer.parseInt(cmds[0]) - 1;
-
-            // L1:<comment>
-            if (index < entries.size()) {
-                final String cmd = cmds[1].trim();
-
-                if (cmd.length() == 0) {
-                    final EntryLink entry = entries.get(index);
-                    send(channel, EntriesUtils.buildLink(index, entry));
-
-                    if (entry.hasTags()) {
-                        send(channel, EntriesUtils.buildTags(index, entry));
-                    }
-
-                    if (entry.hasComments()) {
-                        final EntryComment[] comments = entry.getComments();
-
-                        for (int i = 0; i < comments.length; i++) {
-                            send(channel, EntriesUtils.buildComment(index, i, comments[i]));
-                        }
-                    }
-                } else {
-                    // L1:-
-                    if ("-".equals(cmd)) {
-                        final EntryLink entry = entries.get(index);
-
-                        if (entry.getLogin().equals(login) || isOp(sender)) {
-                            if (pinboard != null) {
-                                pinboard.deletePost(entry);
-                            }
-
-                            if (twitterAutoPost && twitterModule.isEnabled()) {
-                                twitterAutoLinks.remove(index);
-                            }
-
-                            entries.remove(index);
-                            send(channel, "Entry " + Commands.LINK_CMD + (index + 1) + " removed.");
-                            saveEntries(false);
-                        } else {
-                            send(sender, "Please ask a channel op to remove this entry for you.");
-                        }
-                    } else if (cmd.charAt(0) == '|') { // L1:|<title>
-                        if (cmd.length() > 1) {
-                            final EntryLink entry = entries.get(index);
-                            entry.setTitle(cmd.substring(1).trim());
-
-                            if (pinboard != null) {
-                                pinboard.updatePost(entry.getLink(), entry);
-                            }
-
-                            send(channel, EntriesUtils.buildLink(index, entry));
-                            saveEntries(false);
-                        }
-                    } else if (cmd.charAt(0) == '=') { // L1:=<url>
-                        final EntryLink entry = entries.get(index);
-
-                        if (entry.getLogin().equals(login) || isOp(sender)) {
-                            final String link = cmd.substring(1);
-
-                            if (link.matches(LINK_MATCH)) {
-                                final String oldLink = entry.getLink();
-
-                                entry.setLink(link);
-
-                                if (pinboard != null) {
-                                    pinboard.updatePost(oldLink, entry);
-                                }
-
-                                send(channel, EntriesUtils.buildLink(index, entry));
-                                saveEntries(false);
-                            }
-                        } else {
-                            send(sender, "Please ask a channel op to change this link for you.");
-                        }
-                    } else if (cmd.charAt(0) == '?') { // L1:?<author>
-                        if (isOp(sender)) {
-                            if (cmd.length() > 1) {
-                                final EntryLink entry = entries.get(index);
-                                entry.setNick(cmd.substring(1));
-                                send(channel, EntriesUtils.buildLink(index, entry));
-                                saveEntries(false);
-                            }
-                        } else {
-                            send(sender, "Please ask a channel op to change the author of this link for you.");
-                        }
-                    } else {
-                        final EntryLink entry = entries.get(index);
-                        final int cindex = entry.addComment(cmd, sender);
-
-                        final EntryComment comment = entry.getComment(cindex);
-                        send(sender, EntriesUtils.buildComment(index, cindex, comment));
-                        saveEntries(false);
-                    }
-                }
-            }
-        } else if (message.matches(Commands.LINK_CMD + "[0-9]+T:.*")) { // L1T:<+-tag>
-            isCommand = true;
-
-            final String[] cmds = message.substring(1).split("T:", 2);
-            final int index = Integer.parseInt(cmds[0]) - 1;
-
-            if (index < entries.size()) {
-                final String cmd = cmds[1].trim();
-
-                final EntryLink entry = entries.get(index);
-
-                if (cmd.length() != 0) {
-                    if (entry.getLogin().equals(login) || isOp(sender)) {
-                        entry.setTags(cmd);
-
-                        if (pinboard != null) {
-                            pinboard.updatePost(entry.getLink(), entry);
-                        }
-
-                        send(channel, EntriesUtils.buildTags(index, entry));
-                        saveEntries(false);
-                    } else {
-                        send(sender, "Please ask a channel op to change the tags for you.");
-                    }
-                } else {
-                    if (entry.hasTags()) {
-                        send(channel, EntriesUtils.buildTags(index, entry));
-                    } else {
-                        send(sender, "The entry has no tags. Why don't add some?");
-                    }
-                }
-            }
-        } else if (message.matches(Commands.LINK_CMD + "[0-9]+\\.[0-9]+:.*")) { // L11:<command>
-            isCommand = true;
-
-            final String[] cmds = message.substring(1).split("[.:]", 3);
-            final int index = Integer.parseInt(cmds[0]) - 1;
-
-            if (index < entries.size()) {
-                final EntryLink entry = entries.get(index);
-                final int cindex = Integer.parseInt(cmds[1]) - 1;
-
-                if (cindex < entry.getCommentsCount()) {
-                    final String cmd = cmds[2].trim();
-
-                    // L11:
-                    if (cmd.length() == 0) {
-                        final EntryComment comment = entry.getComment(cindex);
-                        send(channel, EntriesUtils.buildComment(index, cindex, comment));
-                    } else if ("-".equals(cmd)) { // L11:-
-                        entry.deleteComment(cindex);
-                        send(channel, "Comment " + Commands.LINK_CMD + (index + 1) + '.' + (cindex + 1) + " removed.");
-                        saveEntries(false);
-                    } else if (cmd.charAt(0) == '?') { // L11:?<author>
-                        if (isOp(sender)) {
-                            if (cmd.length() > 1) {
-                                final EntryComment comment = entry.getComment(cindex);
-                                comment.setNick(cmd.substring(1));
-                                send(channel, EntriesUtils.buildComment(index, cindex, comment));
-                                saveEntries(false);
-                            }
-                        } else {
-                            send(sender, "Please ask a channel op to change the author of this comment for you.");
-                        }
-                    } else {
-                        entry.setComment(cindex, cmd, sender);
-
-                        final EntryComment comment = entry.getComment(cindex);
-                        send(sender, EntriesUtils.buildComment(index, cindex, comment));
-                        saveEntries(false);
-                    }
+        } else {
+            // Commands
+            for (final AbstractCommand command : commands) {
+                if (command.matches(message)) {
+                    command.commandResponse(this, sender, login, message, isOp(sender), false);
+                    isCommand = true;
+                    break;
                 }
             }
         }
 
         if (!isCommand) {
-            storeRecap(sender, message, false);
+            Recap.storeRecap(sender, message, false);
         }
 
         tell.send(sender, true);
@@ -1255,92 +862,48 @@ public class Mobibot extends PircBot {
             args = cmds[1].trim();
         }
 
-        if (cmd.startsWith(Commands.HELP_CMD)) {
+        final boolean isOp = isOp(sender);
+
+        if (cmd.startsWith(Constants.HELP_CMD)) {
             helpResponse(sender, args);
-        } else if ("kill".equals(cmd) && isOp(sender)) {
+        } else if (isOp && "kill".equals(cmd)) {
             sendRawLine("QUIT : Poof!");
             System.exit(0);
-        } else if (Commands.DIE_CMD.equals(cmd) && isOp(sender)) {
+        } else if (isOp && Constants.DIE_CMD.equals(cmd)) {
             send(ircChannel, sender + " has just signed my death sentence.");
             timer.cancel();
             twitterShutdown();
             twitterNotification("killed by  " + sender + " on " + ircChannel);
-            saveEntries(true);
+
             sleep(3);
             quitServer("The Bot Is Out There!");
             System.exit(0);
-        } else if (Commands.CYCLE_CMD.equals(cmd)) {
-            send(ircChannel, sender + " has just asked me to leave. I'll be back!");
-            sleep(0);
-            partChannel(ircChannel);
-            sleep(10);
-            joinChannel(ircChannel);
-        } else if (Commands.RECAP_CMD.equals(cmd)) {
-            recapResponse(sender, true);
-        } else if (Commands.USERS_CMD.equals(cmd)) {
-            usersResponse(sender, true);
-        } else if ((cmds.length > 1) && isOp(sender) && Commands.ADDLOG_CMD.equals(cmd)) {
+        } else if (isOp && (cmds.length > 1) && Constants.ADDLOG_CMD.equals(cmd)) {
             // e.g 2014-04-01
             final File backlog = new File(logsDir + args + EntriesMgr.XML_EXT);
             if (backlog.exists()) {
-                history.add(0, args);
-                send(sender, history.toString(), true);
+                UrlMgr.addHistory(0, args);
+                send(sender, UrlMgr.getHistory().toString(), true);
             } else {
                 send(sender, "The specified log could not be found.");
             }
-        } else if (Commands.ME_CMD.equals(cmd) && isOp(sender)) {
-            if (args.length() > 1) {
-                action(args);
-            } else {
-                helpResponse(sender, Commands.ME_CMD);
-            }
-        } else if (Commands.MODULES_CMD.equals(cmd) && isOp(sender)) {
-            if (MODULES.isEmpty()) {
-                send(sender, "There are not enabled modules.", true);
-            } else {
-                send(sender, "The enabled modules are: ");
-                for (final AbstractModule mod : MODULES) {
-                    send(sender, helpIndent(mod.getClass().getSimpleName()));
-                }
-            }
-        } else if ((cmds.length > 1) && isOp(sender) && Commands.NICK_CMD.equals(cmd)) {
-            changeNick(args);
-        } else if (Commands.SAY_CMD.equals(cmd) && isOp(sender)) {
-            if (cmds.length > 1) {
-                send(ircChannel, args, true);
-            } else {
-                helpResponse(sender, Commands.SAY_CMD);
-            }
-        } else if (Commands.MSG_CMD.equals(cmd) && isOp(sender)) {
-            if (cmds.length > 1) {
-                final String[] msg = args.split(" ", 2);
-
-                if (args.length() > 2) {
-                    send(msg[0], msg[1], true);
-                } else {
-                    helpResponse(sender, Commands.MSG_CMD);
-                }
-            } else {
-                helpResponse(sender, Commands.MSG_CMD);
-            }
-        } else if (Commands.VIEW_CMD.equals(cmd)) {
-            viewResponse(sender, args, true);
         } else if (Tell.TELL_CMD.equals(cmd) && tell.isEnabled()) {
             tell.response(sender, args);
-        } else if (Commands.INFO_CMD.equals(cmd)) {
-            infoResponse(sender, true);
-        } else if (Commands.VERSION_CMD.equals(cmd)) {
-            versionResponse(sender, true);
-        } else if (Commands.DEBUG_CMD.equals(cmd) && isOp(sender)) {
+        } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) {
             if (logger.isDebugEnabled()) {
                 Configurator.setLevel(logger.getName(), loggerLevel);
             } else {
                 Configurator.setLevel(logger.getName(), Level.DEBUG);
-
             }
             send(sender, "Debug logging is " + (logger.isDebugEnabled() ? "enabled." : "disabled."), true);
         } else {
-            for (final AbstractModule module : MODULES) {
+            for (final AbstractCommand command : commands) {
+                if (command.getCommand().startsWith(cmd)) {
+                    command.commandResponse(this, sender, login, args, isOp, true);
+                    return;
+                }
+            }
+            for (final AbstractModule module : modules) {
                 if (module.isPrivateMsgEnabled()) {
                     for (final String c : module.getCommands()) {
                         if (cmd.equals(c)) {
@@ -1350,8 +913,7 @@ public class Mobibot extends PircBot {
                     }
                 }
             }
-
-            helpResponse(sender, "");
+            helpDefault(sender, isOp);
         }
     }
 
@@ -1362,7 +924,7 @@ public class Mobibot extends PircBot {
     protected final void onAction(final String sender, final String login, final String hostname, final String target,
                                   final String action) {
         if (target != null && target.equals(ircChannel)) {
-            storeRecap(sender, action, true);
+            Recap.storeRecap(sender, action, true);
         }
     }
 
@@ -1382,31 +944,6 @@ public class Mobibot extends PircBot {
         tell.send(newNick);
     }
 
-    /**
-     * Responds with the last 10 public messages.
-     *
-     * @param sender    The nick of the person who sent the private message.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    private void recapResponse(final String sender, final boolean isPrivate) {
-        if (!recap.isEmpty()) {
-            for (final String r : recap) {
-                send(sender, r, isPrivate);
-            }
-        } else {
-            send(sender, "Sorry, nothing to recap.", true);
-        }
-    }
-
-    /**
-     * Saves the entries.
-     *
-     * @param isDayBackup Set the <code>true</code> if the daily backup file should also be created.
-     */
-    final void saveEntries(final boolean isDayBackup) {
-        EntriesMgr.saveEntries(this, entries, history, isDayBackup);
-    }
-
     /**
      * Sends a private message or notice.
      *
@@ -1518,21 +1055,6 @@ public class Mobibot extends PircBot {
         identMsg = msg;
     }
 
-    /**
-     * Sets the Ignored nicks.
-     *
-     * @param nicks The nicks to ignore
-     */
-    final void setIgnoredNicks(final String nicks) {
-        if (isNotBlank(nicks)) {
-            final StringTokenizer st = new StringTokenizer(nicks, ",");
-
-            while (st.hasMoreTokens()) {
-                ignoredNicks.add(st.nextToken().trim().toLowerCase(Constants.LOCALE));
-            }
-        }
-    }
-
     /**
      * Sets the pinboard authentication.
      *
@@ -1544,28 +1066,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Sets the default tags/categories.
-     *
-     * @param tags The tags.
-     */
-    final void setTags(final String tags) {
-        defaultTags = tags;
-    }
-
-    /**
-     * Sets the tags keywords matches.
-     *
-     * @param matches The tags keywords.
-     */
-    final void setTagsKeywords(final String matches) {
-        if (isNotBlank(matches)) {
-            tagsKeywords.addAll(Arrays.asList(matches.split(", +?| +")));
-        } else {
-            tagsKeywords.clear();
-        }
-    }
-
     /**
      * Sets the weblog URL.
      *
@@ -1576,31 +1076,36 @@ public class Mobibot extends PircBot {
     }
 
     /**
-     * Stores the last 10 public messages and actions.
+     * Sleeps for the specified number of seconds.
      *
-     * @param sender   The nick of the person who sent the private message.
-     * @param message  The actual message sent.
-     * @param isAction Set to <code>true</code> if the message is an action.
+     * @param secs The number of seconds to sleep for.
      */
-    private void storeRecap(final String sender, final String message, final boolean isAction) {
-        recap.add(
-                Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC())) + " -> " + sender + (isAction ? " " : ": ")
-                + message);
-
-        if (recap.size() > MAX_RECAP) {
-            recap.remove(0);
+    public final void sleep(final int secs) {
+        try {
+            Thread.sleep(secs * 1000L);
+        } catch (InterruptedException ignore) {
+            // Do nothing
         }
     }
 
     /**
-     * Auto-post to twitter.
+     * Add an entry to be posted on twitter.
+     *
+     * @param index The entry index.
+     */
+    public void twitterAddEntry(final int index) {
+        twitterEntries.add(index);
+    }
+
+    /**
+     * Post an entry to twitter.
      *
      * @param index The post entry index.
      */
-    final void twitterAutoPost(final int index) {
-        if (twitterAutoPost && twitterModule.isEnabled()
-            && twitterAutoLinks.contains(index) && entries.size() >= index) {
-            final EntryLink entry = entries.get(index);
+    @SuppressFBWarnings("SUI_CONTAINS_BEFORE_REMOVE")
+    public final void twitterEntryPost(final int index) {
+        if (isTwitterAutoPost && twitterEntries.contains(index) && UrlMgr.getEntriesCount() >= index) {
+            final EntryLink entry = UrlMgr.getEntry(index);
             final String msg =
                     entry.getTitle() + ' ' + entry.getLink() + " via " + entry.getNick() + " on " + getChannel();
             new Thread(() -> {
@@ -1608,14 +1113,23 @@ public class Mobibot extends PircBot {
                     twitterModule.post(twitterHandle, msg, false);
                 } catch (ModuleException e) {
                     if (logger.isWarnEnabled()) {
-                        logger.warn("Failed to post link on twitter.", e);
+                        logger.warn("Failed to post entry on twitter.", e);
                     }
                 }
             }).start();
-            twitterAutoLinks.remove((Object) index);
+            twitterEntries.remove(index);
         }
     }
 
+    /**
+     * Return the total count of links to be posted to twitter.
+     *
+     * @return The count of twitter links.
+     */
+    public final int twitterLinksCount() {
+        return twitterEntries.size();
+    }
+
     /**
      * Send a notification to the registered Twitter handle.
      *
@@ -1638,133 +1152,35 @@ public class Mobibot extends PircBot {
         }
     }
 
+    /**
+     * Removes entry from twitter auto-post.
+     *
+     * @param index The entry's index.
+     */
+    public final void twitterRemoveEntry(final int index) {
+        twitterEntries.remove(index);
+    }
+
     /**
      * Post all the links on twitter on shutdown.
      */
     final void twitterShutdown() {
         if (twitterModule.isEnabled() && isNotBlank(twitterHandle)) {
-            for (final int i : twitterAutoLinks) {
-                twitterAutoPost(i);
+            for (final int i : twitterEntries) {
+                twitterEntryPost(i);
             }
         }
     }
 
     /**
-     * Responds with the users on a channel.
+     * Updates pin on pinboard.
      *
-     * @param sender    The nick of the person who sent the message.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
+     * @param oldUrl The old pin url.
+     * @param entry  The entry to update.
      */
-    private void usersResponse(final String sender, final boolean isPrivate) {
-        final User[] users = getUsers(ircChannel);
-        final String[] nicks = new String[users.length];
-
-        for (int i = 0; i < users.length; i++) {
-            final String nick = users[i].getNick();
-            if (isOp(nick)) {
-                nicks[i] = '@' + users[i].getNick();
-            } else {
-                nicks[i] = users[i].getNick();
-            }
-        }
-
-        Arrays.sort(nicks, String.CASE_INSENSITIVE_ORDER);
-
-        send(sender, String.join(" ", nicks), isPrivate);
-    }
-
-    /**
-     * Responds with the bot's version info.
-     *
-     * @param sender    The nick of the person who sent the message.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    private void versionResponse(final String sender, final boolean isPrivate) {
-        if (isOp(sender)) {
-            for (final String version : VERSION_STRS) {
-                send(sender, version, isPrivate);
-            }
-        }
-    }
-
-    /**
-     * Responds with the stored links.
-     *
-     * @param sender    The nick of the person who sent the message.
-     * @param args      The view command arguments.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    private void viewResponse(final String sender, final String args, final boolean isPrivate) {
-        if (!entries.isEmpty()) {
-            final int max = entries.size();
-            String lcArgs = args.toLowerCase(Constants.LOCALE);
-            int i = 0;
-
-            if ((lcArgs.length() <= 0) && (max > MAX_ENTRIES)) {
-                i = max - MAX_ENTRIES;
-            }
-
-            if (lcArgs.matches("^\\d+(| .*)")) {
-                final String[] split = lcArgs.split(" ", 2);
-
-                try {
-                    i = Integer.parseInt(split[0]);
-
-                    if (i > 0) {
-                        i--;
-                    }
-
-                    if (split.length == 2) {
-                        lcArgs = split[1].trim();
-                    } else {
-                        lcArgs = "";
-                    }
-
-                    if (i > max) {
-                        i = 0;
-                    }
-                } catch (NumberFormatException ignore) {
-                    // Do nothing
-                }
-            }
-
-            EntryLink entry;
-            int sent = 0;
-
-            for (; i < max; i++) {
-                entry = entries.get(i);
-
-                if (lcArgs.length() > 0) {
-                    if ((entry.getLink().toLowerCase(Constants.LOCALE).contains(lcArgs))
-                        || (entry.getTitle().toLowerCase(Constants.LOCALE).contains(lcArgs))
-                        || (entry.getNick().toLowerCase(Constants.LOCALE).contains(lcArgs))) {
-                        if (sent > MAX_ENTRIES) {
-                            send(sender,
-                                 "To view more, try: "
-                                 + bold(getNick() + ": " + Commands.VIEW_CMD + ' ' + (i + 1) + ' ' + lcArgs),
-                                 isPrivate);
-
-                            break;
-                        }
-
-                        send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate);
-                        sent++;
-                    }
-                } else {
-                    if (sent > MAX_ENTRIES) {
-                        send(sender,
-                             "To view more, try: " + bold(getNick() + ": " + Commands.VIEW_CMD + ' ' + (i + 1)),
-                             isPrivate);
-
-                        break;
-                    }
-
-                    send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate);
-                    sent++;
-                }
-            }
-        } else {
-            send(sender, "There is currently nothing to view. Why don't you post something?", isPrivate);
+    public final void updatePin(final String oldUrl, final EntryLink entry) {
+        if (pinboard != null) {
+            pinboard.updatePost(oldUrl, entry);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt b/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
index f3a5450..09abe27 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
@@ -36,6 +36,6 @@ import java.util.*
 
 class TwitterTimer(var bot: Mobibot, private var index: Int) : TimerTask() {
     override fun run() {
-       bot.twitterAutoPost(index)
+        bot.twitterEntryPost(index)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
index 1489ecf..056d216 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java
@@ -159,6 +159,16 @@ public final class Utils {
         return colorize(s, Colors.DARK_GREEN);
     }
 
+    /**
+     * Returns indented help string.
+     *
+     * @param help The help string.
+     * @return The indented help string.
+     */
+    public static String helpIndent(final String help) {
+        return "        " + help;
+    }
+
     /**
      * Returns the specified date as an ISO local date string.
      *
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
new file mode 100644
index 0000000..aeaac2d
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -0,0 +1,67 @@
+/*
+ * AbstractCommand.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+
+abstract class AbstractCommand {
+    abstract val command: String
+    abstract val help: List<String>
+    abstract val isOp: Boolean
+    abstract val isPublic: Boolean
+    abstract val isVisible: Boolean
+
+    abstract fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    )
+
+    open fun helpResponse(bot: Mobibot, command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
+        if (!this.isOp || this.isOp == isOp) {
+            for (h in help) {
+                bot.send(sender, String.format(h, bot.nick), isPrivate)
+            }
+            return true
+        }
+        return false
+    }
+
+    open fun matches(message: String): Boolean {
+        return false
+    }
+
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
new file mode 100644
index 0000000..fa18a1b
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -0,0 +1,68 @@
+/*
+ * Cycle.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Cycle : AbstractCommand() {
+    private val wait = 10
+    override val command = "cycle"
+    override val help = listOf(
+        Utils.bold("To have the bot leave the channel and come back:"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.send(bot.channel, "$sender has just asked me to leave. I'll be back!")
+            bot.sleep(wait)
+            bot.partChannel(bot.channel)
+            bot.sleep(wait)
+            bot.joinChannel(bot.channel)
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
new file mode 100644
index 0000000..b67fc18
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -0,0 +1,111 @@
+/*
+ * Ignore.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import java.util.*
+
+class Ignore(defaultIgnore: String) : AbstractCommand() {
+    private val keyword = "me"
+
+    init {
+        if (defaultIgnore.isNotBlank()) {
+            ignored.addAll(defaultIgnore.split(", +?| +"))
+        }
+    }
+
+    override val command = IGNORE
+    override val help = listOf(
+        Utils.bold("To check your ignore status:"),
+        Utils.helpIndent("%s: $command"),
+        Utils.bold("To toggle your ignore status:"),
+        Utils.helpIndent("%s: $command $keyword")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        const val IGNORE = "ignore"
+        private val ignored = HashSet<String>()
+
+        @JvmStatic
+        fun isNotIgnored(nick: String): Boolean {
+            return !ignored.contains(nick.toLowerCase())
+        }
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            val nick = sender.toLowerCase()
+            val isMe = args.toLowerCase().startsWith(keyword)
+            if (isMe) {
+                if (ignored.remove(nick)) {
+                    bot.send(sender, "You are no longer ignored.")
+                } else {
+                    ignored.add(nick)
+                    bot.send(sender, "You are now ignored.")
+                }
+            } else {
+                if (ignored.contains(nick)) {
+                    bot.send(sender, "You are currently ignored.")
+                } else {
+                    bot.send(sender, "You are not currently ignored.")
+                }
+            }
+        } else {
+            if (args.isNotEmpty()) {
+                val nicks = args.toLowerCase().split(" ")
+                for (nick in nicks) {
+                    val ignore = if (keyword == nick) {
+                        sender.toLowerCase()
+                    } else {
+                        nick
+                    }
+                    if (!ignored.remove(ignore)) {
+                        ignored.add(ignore)
+                    }
+                }
+            }
+            bot.send(sender, "The following nicks are ignored: ${ignored.joinToString(", ")}")
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
new file mode 100644
index 0000000..7fe62e4
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -0,0 +1,92 @@
+/*
+ * Info.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.links.UrlMgr
+import org.jibble.pircbot.Colors
+import java.lang.management.ManagementFactory
+
+class Info : AbstractCommand() {
+    override val command = "info"
+    override val help = listOf(
+        Utils.bold("To view information about the bot:"),
+        Utils.helpIndent("%s: $command")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        for (info in Mobibot.INFO) {
+            if (info.startsWith("https://")) {
+                bot.send(sender, info, Colors.DARK_GREEN, isPrivate)
+            } else {
+                bot.send(sender, info, isPrivate)
+            }
+        }
+
+        val info = StringBuilder("Uptime: ")
+
+        with(info) {
+            append(Utils.uptime(ManagementFactory.getRuntimeMXBean().uptime))
+            append(" [Entries: ")
+            append(UrlMgr.entriesCount)
+
+            if (isOp) {
+                if (bot.tell.isEnabled) {
+                    append(", Messages: ")
+                    append(bot.tell.size())
+                }
+                if (bot.isTwitterAutoPost) {
+                    append(", Twitter: ")
+                    append(bot.twitterLinksCount())
+                }
+            }
+
+            append(", Recap: ")
+            append(Recap.recapCount())
+            append(']')
+        }
+
+        bot.send(sender, info.toString(), isPrivate)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
new file mode 100644
index 0000000..a229009
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
@@ -0,0 +1,62 @@
+/*
+ * Me.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Me : AbstractCommand() {
+    override val command = "me"
+    override val help = listOf(
+        Utils.bold("To have the bot perform an action:"),
+        Utils.helpIndent("/msg %s $command <action>")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.action(args)
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt b/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt
new file mode 100644
index 0000000..79c6224
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt
@@ -0,0 +1,64 @@
+/*
+ * AbstractCommandImpl.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class MobibotVersion : AbstractCommand() {
+    override val command = "version"
+    override val help = listOf(
+        Utils.bold("To view the version data (bot, java, etc.):"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            for (v in Mobibot.MOBIBOT_VERSIONS) {
+                bot.send(sender, v, isPrivate)
+            }
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
new file mode 100644
index 0000000..de494a4
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -0,0 +1,68 @@
+/*
+ * Modules.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Modules : AbstractCommand() {
+    override val command = "modules"
+    override val help = listOf(
+        Utils.bold("To view a list of enabled modules:"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            val modulesNames = bot.modulesNames
+            if (modulesNames.isEmpty()) {
+                bot.send(sender, "There are no enabled modules.", true)
+            } else {
+                bot.send(sender, Utils.bold("The enabled modules are: "))
+                bot.send(sender, Utils.helpIndent(modulesNames.joinToString(", ")))
+            }
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
new file mode 100644
index 0000000..5c01b83
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -0,0 +1,67 @@
+/*
+ * Msg.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Msg : AbstractCommand() {
+    override val command = "msg"
+    override val help = listOf(
+        Utils.bold("To have the bot send a private message to someone:"),
+        Utils.helpIndent("/msg %s $command <nick> <text>")
+    )
+    override val isOp = true
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            val msg = args.split(" ", limit = 2)
+            if (args.length > 2) {
+                bot.send(msg[0], msg[1], true)
+            } else {
+                helpResponse(bot, command, sender, isOp, isPrivate)
+            }
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
new file mode 100644
index 0000000..41396ed
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -0,0 +1,62 @@
+/*
+ * Nick.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Nick : AbstractCommand() {
+    override val command = "nick"
+    override val help = listOf(
+        Utils.bold("To change the bot's nickname:"),
+        Utils.helpIndent("/msg %s $command <nick>")
+    )
+    override val isOp = true
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.changeNick(args)
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
new file mode 100644
index 0000000..2ffc255
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -0,0 +1,95 @@
+/*
+ * Recap.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import java.time.Clock
+import java.time.LocalDateTime
+import java.util.*
+
+class Recap : AbstractCommand() {
+    override val command = "recap"
+    override val help = listOf(
+        Utils.bold("To list the last 10 public channel messages:"),
+        Utils.helpIndent("%s: $command"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        private val recaps = ArrayList<String>(0)
+
+        @JvmStatic
+        fun recapCount(): Int {
+            return recaps.size
+        }
+
+        /**
+         * Stores the last 10 public messages and actions.
+         *
+         * @param sender   The nick of the person who sent the private message.
+         * @param message  The actual message sent.
+         * @param isAction Set to `true` if the message is an action.
+         */
+        @JvmStatic
+        fun storeRecap(sender: String, message: String, isAction: Boolean) {
+            recaps.add(
+                Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC()))
+                    + " -> ${sender}: " + (if (isAction) " " else ": ") + message
+            )
+            if (recaps.size > 10) {
+                recaps.removeAt(0)
+            }
+        }
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (recaps.isNotEmpty()) {
+            for (r in recaps) {
+                bot.send(sender, r, isPrivate)
+            }
+        } else {
+            bot.send(sender, "Sorry, nothing to recap.", true)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
new file mode 100644
index 0000000..c0b1e79
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
@@ -0,0 +1,63 @@
+/*
+ * Say.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Say : AbstractCommand() {
+    override val command = "say"
+    override val help = listOf(
+        Utils.bold("To have the bot say something on the channel:"),
+        Utils.helpIndent("/msg %s $command <text>")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.send(bot.channel, args, true)
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
new file mode 100644
index 0000000..1f0f735
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -0,0 +1,71 @@
+/*
+ * Users.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import org.jibble.pircbot.User
+import java.util.*
+
+class Users : AbstractCommand() {
+    override val command = "users"
+    override val help = listOf(
+        Utils.bold("To list the users present on the channel:"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val users: Array<User> = bot.getUsers(bot.channel)
+        val nicks = ArrayList<String>()
+        users.forEach { user ->
+            if (bot.isOp(user.nick)) {
+                nicks.add('@'.toString() + user.nick)
+            } else {
+                nicks.add(user.nick)
+            }
+        }
+
+        bot.send(sender, nicks.sorted().joinToString(" "), isPrivate)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
new file mode 100644
index 0000000..9e1138f
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -0,0 +1,130 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+
+class Comment : AbstractCommand() {
+    override val command = COMMAND
+    override val help = listOf(
+        Utils.bold("To add a comment:"),
+        Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
+        "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
+        Utils.bold("To edit a comment, use its label: "),
+        Utils.helpIndent("${Constants.LINK_CMD}1.1:This is an edited comment"),
+        Utils.bold("To delete a comment, use its label and a minus sign: "),
+        Utils.helpIndent("${Constants.LINK_CMD}1.1:-")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        const val COMMAND = "comment"
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val cmds = args.substring(1).split("[.:]".toRegex(), 3)
+        val index = cmds[0].toInt() - 1
+
+        if (index < UrlMgr.entriesCount) {
+            val entry: EntryLink = UrlMgr.getEntry(index)
+            val cindex = cmds[1].toInt() - 1
+            if (cindex < entry.commentsCount) {
+                val cmd = cmds[2].trim()
+
+                // L1.1:
+                if (cmd.isEmpty()) {
+                    val comment = entry.getComment(cindex)
+                    bot.send(bot.channel, EntriesUtils.buildComment(index, cindex, comment))
+                } else if ("-" == cmd) { // L11:-
+                    entry.deleteComment(cindex)
+                    bot.send(
+                        bot.channel,
+                        "Comment ${Constants.LINK_CMD}${index + 1}.${cindex + 1} removed."
+                    )
+                    UrlMgr.saveEntries(bot, false)
+                } else if (cmd[0] == '?') { // L1.1:?<author>
+                    if (isOp) {
+                        if (cmd.length > 1) {
+                            val comment = entry.getComment(cindex)
+                            comment.nick = cmd.substring(1)
+                            bot.send(bot.channel, EntriesUtils.buildComment(index, cindex, comment))
+                            UrlMgr.saveEntries(bot, false)
+                        }
+                    } else {
+                        bot.send(sender, "Please ask a channel op to change the author of this comment for you.")
+                    }
+                } else {
+                    entry.setComment(cindex, cmd, sender)
+                    val comment = entry.getComment(cindex)
+                    bot.send(sender, EntriesUtils.buildComment(index, cindex, comment))
+                    UrlMgr.saveEntries(bot, false)
+                }
+            }
+        }
+    }
+
+    override fun helpResponse(
+        bot: Mobibot,
+        command: String,
+        sender: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ): Boolean {
+        if (super.helpResponse(bot, command, sender, isOp, isPrivate)) {
+            if (isOp) {
+                bot.send(sender, Utils.bold("To change a comment's author:"), isPrivate)
+                bot.send(sender, Utils.helpIndent("/msg ${bot.nick} ${Constants.LINK_CMD}1.1:?<nick>"), isPrivate)
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun matches(message: String): Boolean {
+        return message.matches("^${Constants.LINK_CMD}[0-9]+\\.[0-9]+:.*".toRegex())
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
new file mode 100644
index 0000000..6d05a0e
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -0,0 +1,147 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+
+class Posting : AbstractCommand() {
+    override val command = "posting"
+    override val help = listOf(
+        Utils.bold("Post a URL, by saying it on a line on its own:"),
+        Utils.helpIndent("<url> [<title>] ${Tags.COMMAND}}: <+tag> [...]]"),
+        "I will reply with a label, for example:" + Utils.bold("${Constants.LINK_CMD}1"),
+        Utils.bold("To add a title, use its label and a pipe:"),
+        Utils.helpIndent("${Constants.LINK_CMD}1:|This is the title"),
+        Utils.bold("To add a comment:"),
+        Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
+        "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
+        Utils.bold("To edit a comment, see: "),
+        Utils.helpIndent("/msg %s ${Constants.HELP_CMD} ${Comment.COMMAND}")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val cmds = args.substring(1).split(":", limit = 2)
+        val index = cmds[0].toInt() - 1
+
+        if (index < UrlMgr.entriesCount) {
+            val cmd = cmds[1].trim()
+            if (cmd.isEmpty()) {
+                val entry: EntryLink = UrlMgr.getEntry(index)
+                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                if (entry.hasTags()) {
+                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+                }
+                if (entry.hasComments()) {
+                    val comments = entry.comments
+                    for (i in comments.indices) {
+                        bot.send(bot.channel, EntriesUtils.buildComment(index, i, comments[i]))
+                    }
+                }
+            } else {
+                // L1:-
+                if ("-" == cmd) {
+                    val entry: EntryLink = UrlMgr.getEntry(index)
+                    if (entry.login == login || isOp) {
+                        bot.deletePin(entry)
+                        if (bot.isTwitterAutoPost) {
+                            bot.twitterRemoveEntry(index)
+                        }
+                        UrlMgr.removeEntry(index)
+                        bot.send(bot.channel, "Entry ${Constants.LINK_CMD}${index + 1} removed.")
+                        UrlMgr.saveEntries(bot, false)
+                    } else {
+                        bot.send(sender, "Please ask a channel op to remove this entry for you.")
+                    }
+                } else if (cmd[0] == '|') { // L1:|<title>
+                    if (cmd.length > 1) {
+                        val entry: EntryLink = UrlMgr.getEntry(index)
+                        entry.title = cmd.substring(1).trim()
+                        bot.updatePin(entry.link, entry)
+                        bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                        UrlMgr.saveEntries(bot, false)
+                    }
+                } else if (cmd[0] == '=') { // L1:=<url>
+                    val entry: EntryLink = UrlMgr.getEntry(index)
+                    if (entry.login == login || isOp) {
+                        val link = cmd.substring(1)
+                        if (link.matches(UrlMgr.LINK_MATCH.toRegex())) {
+                            val oldLink = entry.link
+                            entry.link = link
+                            bot.updatePin(oldLink, entry)
+                            bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                            UrlMgr.saveEntries(bot, false)
+                        }
+                    } else {
+                        bot.send(sender, "Please ask channel op to change this link for you.")
+                    }
+                } else if (cmd[0] == '?') { // L1:?<author>
+                    if (isOp) {
+                        if (cmd.length > 1) {
+                            val entry: EntryLink = UrlMgr.getEntry(index)
+                            entry.nick = cmd.substring(1)
+                            bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                            UrlMgr.saveEntries(bot, false)
+                        }
+                    } else {
+                        bot.send(sender, "Please ask a channel op to change the author of this link for you.")
+                    }
+                } else {
+                    val entry: EntryLink = UrlMgr.getEntry(index)
+                    val cindex = entry.addComment(cmd, sender)
+                    val comment = entry.getComment(cindex)
+                    bot.send(sender, EntriesUtils.buildComment(index, cindex, comment))
+                    UrlMgr.saveEntries(bot, false)
+                }
+            }
+        }
+    }
+
+    override fun matches(message: String): Boolean {
+        return message.matches("${Constants.LINK_CMD}[0-9]+:.*".toRegex())
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
new file mode 100644
index 0000000..204f41f
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -0,0 +1,92 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+
+class Tags : AbstractCommand() {
+    override val command = COMMAND
+    override val help = listOf(
+        Utils.bold("To categorize or tag a URL, use its label and a T:"),
+        Utils.helpIndent("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        const val COMMAND = "tags"
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val cmds = args.substring(1).split("T:", limit = 2)
+        val index = cmds[0].toInt() - 1
+
+        if (index < UrlMgr.entriesCount) {
+            val cmd = cmds[1].trim()
+            val entry: EntryLink = UrlMgr.getEntry(index)
+            if (cmd.isNotEmpty()) {
+                if (entry.login == login || isOp) {
+                    entry.setTags(cmd)
+                    bot.updatePin(entry.link, entry)
+                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+                    UrlMgr.saveEntries(bot, false)
+                } else {
+                    bot.send(sender, "Please ask a channel op to change the tags for you.")
+                }
+            } else {
+                if (entry.hasTags()) {
+                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+                } else {
+                    bot.send(sender, "The entry has no tags. Why don't add some?")
+                }
+            }
+        }
+    }
+
+    override fun matches(message: String): Boolean {
+        return message.matches("^${Constants.LINK_CMD}[0-9]+T:.*".toRegex())
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
new file mode 100644
index 0000000..c1a3b37
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -0,0 +1,243 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.TwitterTimer
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.commands.Ignore
+import net.thauvin.erik.mobibot.entries.EntriesMgr
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+import org.jsoup.Jsoup
+import java.io.IOException
+import java.util.*
+
+class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
+    private val tagsKeywords = ArrayList<String>()
+    override val command = Constants.LINK_CMD
+    override val help = emptyList<String>()
+    override val isOp = false
+    override val isPublic = false
+    override val isVisible = false
+
+    init {
+        tagsKeywords.addAll(keywords.split(", +?| +"))
+        Companion.defaultTags = defaultTags
+    }
+
+    companion object {
+        const val LINK_MATCH = "^[hH][tT][tT][pP](|[sS])://.*"
+
+        // Entries array
+        private val entries = ArrayList<EntryLink>(0)
+
+        // History/backlogs array
+        private val history = ArrayList<String>(0)
+        private lateinit var defaultTags: String
+
+        @JvmStatic
+        val entriesCount
+            get() = entries.size
+
+        @JvmStatic
+        var today: String = Utils.today()
+            private set
+
+        @JvmStatic
+        fun addHistory(index: Int, entry: String) {
+            history.add(index, entry)
+        }
+
+        /**
+         * Saves the entries.
+         *
+         * @param isDayBackup Set the `true` if the daily backup file should also be created.
+         */
+        @JvmStatic
+        fun saveEntries(bot: Mobibot, isDayBackup: Boolean) {
+            EntriesMgr.saveEntries(bot, entries, history, isDayBackup)
+        }
+
+        @JvmStatic
+        fun removeEntry(index: Int) {
+            entries.removeAt(index)
+        }
+
+        @JvmStatic
+        fun getEntry(index: Int): EntryLink {
+            return entries[index]
+        }
+
+        @JvmStatic
+        fun getHistory(): List<String> {
+            return history
+        }
+
+        @JvmStatic
+        fun startup(current: String, backlogs: String, channel: String) {
+            today = EntriesMgr.loadEntries(current, channel, entries)
+            if (Utils.today() != today) {
+                this.entries.clear()
+                today = Utils.today()
+            }
+            EntriesMgr.loadBacklogs(backlogs, history)
+        }
+    }
+
+    @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val cmds = args.split(" ".toRegex(), 2)
+
+        if (Ignore.isNotIgnored(sender) && (cmds.size == 1
+                || !cmds[1].contains(bot.nick)
+                || !cmds[1].endsWith(" (${Ignore.IGNORE}"))) {
+            val link = cmds[0].trim()
+            var isBackup = false
+            val dupIndex: Int = findDupEntry(link)
+            if (dupIndex == -1) {
+                if (Utils.today() != today) {
+                    isBackup = true
+                    saveEntries(bot, true)
+                    entries.clear()
+                    today = Utils.today()
+                }
+                val tags: StringBuilder = StringBuilder(defaultTags)
+                var title = Constants.NO_TITLE
+                if (cmds.size == 2) {
+                    val data = cmds[1].trim().split("${Tags.COMMAND}:", limit = 2)
+                    if (data.size == 1) {
+                        title = data[0].trim()
+                    } else {
+                        if (data[0].isNotBlank()) {
+                            title = data[0].trim()
+                        }
+                        tags.append(' ').append(data[1].trim())
+                    }
+                }
+                if (Constants.NO_TITLE == title) {
+                    try {
+                        val html = Jsoup.connect(link).userAgent("Mozilla").get()
+                        val htmlTitle = html.title()
+                        if (htmlTitle.isNotBlank()) {
+                            val split = htmlTitle.split("( \\| )".toRegex(), 2)
+                            title = if (split.size == 2) {
+                                split[0]
+                            } else {
+                                htmlTitle
+                            }
+                        }
+                    } catch (ignore: IOException) {
+                        // Do nothing
+                    }
+                }
+                if (tagsKeywords.isNotEmpty()) {
+                    for (match in tagsKeywords) {
+                        val m = match.trim()
+                        if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
+                            tags.append(' ').append(m)
+                        }
+                    }
+                }
+                entries.add(EntryLink(link, title, sender, login, bot.channel, tags.toString()))
+                val index: Int = entries.size - 1
+                val entry: EntryLink = entries[index]
+                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+
+                // Add Entry to pinboard.
+                bot.addPin(entry)
+
+                // Queue link for posting to twitter
+                if (bot.isTwitterAutoPost) {
+                    bot.twitterAddEntry(index)
+                    Mobibot.timer.schedule(
+                        TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L
+                    )
+                }
+                saveEntries(bot, isBackup)
+                if (Constants.NO_TITLE == entry.title) {
+                    bot.send(sender, Utils.bold("Please specify a title, by typing:"), true)
+                    bot.send(
+                        sender,
+                        Utils.helpIndent(Constants.LINK_CMD + (index + 1) + ":|This is the title"),
+                        true
+                    )
+                }
+            } else {
+                val entry: EntryLink = entries[dupIndex]
+                bot.send(
+                    sender, Utils.bold("Duplicate") + " >> " + EntriesUtils.buildLink(dupIndex, entry)
+                )
+            }
+        }
+    }
+
+    override fun helpResponse(
+        bot: Mobibot,
+        command: String,
+        sender: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ): Boolean = false
+
+    /**
+     * Returns the index of the specified duplicate entry, if any.
+     *
+     * @param link The link.
+     * @return The index or -1 if none.
+     */
+    private fun findDupEntry(link: String): Int {
+        synchronized(entries) {
+            for (i in entries.indices) {
+                if (link == entries[i].link) {
+                    return i
+                }
+            }
+        }
+        return -1
+    }
+
+    override fun matches(message: String): Boolean {
+        return message.matches(LINK_MATCH.toRegex())
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
new file mode 100644
index 0000000..e45885d
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -0,0 +1,130 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.entriesCount
+import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.getEntry
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+
+class View : AbstractCommand() {
+    private val maxEntries = 8
+    override val command = VIEW_CMD
+    override val help = listOf(
+        Utils.bold("To list or search the current URL posts:"),
+        Utils.helpIndent("%s: $command [<start>] [<query>]")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        const val VIEW_CMD = "view"
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (entriesCount != 0) {
+            val max = entriesCount
+            var lcArgs = args.toLowerCase(Constants.LOCALE)
+            var i = 0
+            if (lcArgs.isEmpty() && max > maxEntries) {
+                i = max - maxEntries
+            }
+            if (lcArgs.matches("^\\d+(| .*)".toRegex())) {
+                val split = lcArgs.split(" ", limit = 2)
+                try {
+                    i = split[0].toInt()
+                    if (i > 0) {
+                        i--
+                    }
+                    lcArgs = if (split.size == 2) {
+                        split[1].trim()
+                    } else {
+                        ""
+                    }
+                    if (i > max) {
+                        i = 0
+                    }
+                } catch (ignore: NumberFormatException) {
+                    // Do nothing
+                }
+            }
+            var entry: EntryLink
+            var sent = 0
+            while (i < max) {
+                entry = getEntry(i)
+                if (lcArgs.isNotEmpty()) {
+                    if (entry.link.toLowerCase().contains(lcArgs)
+                        || entry.title.toLowerCase().contains(lcArgs)
+                        || entry.nick.toLowerCase().contains(lcArgs)) {
+                        if (sent > maxEntries) {
+                            bot.send(
+                                sender, "To view more, try: "
+                                + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"),
+                                isPrivate
+                            )
+                            break
+                        }
+                        bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate)
+                        sent++
+                    }
+                } else {
+                    if (sent > maxEntries) {
+                        bot.send(
+                            sender,
+                            "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}"),
+                            isPrivate
+                        )
+                        break
+                    }
+                    bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate)
+                    sent++
+                }
+                i++
+            }
+        } else {
+            bot.send(sender, "There is currently nothing to view. Why don't you post something?", isPrivate)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
similarity index 75%
rename from src/main/java/net/thauvin/erik/mobibot/tell/Tell.java
rename to src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index 9692505..e8cee58 100644
--- a/src/main/java/net/thauvin/erik/mobibot/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -30,12 +30,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.tell;
+package net.thauvin.erik.mobibot.commands.tell;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Commands;
 import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
+import net.thauvin.erik.mobibot.commands.links.View;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -112,16 +112,16 @@ public class Tell {
     }
 
     /**
-     * Responds with help.
+     * Responds with Constants.
      *
      * @param sender The sender.
      */
     public void helpResponse(final String sender) {
         bot.send(sender, "To send a message to someone when they join the channel:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TELL_CMD + " <nick> <message>"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + " <nick> <message>"));
 
         bot.send(sender, "To view queued and sent messages:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + Commands.VIEW_CMD));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + View.VIEW_CMD));
 
         bot.send(sender, "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."));
     }
@@ -141,19 +141,20 @@ public class Tell {
      * @param sender The sender's nick.
      * @param cmds   The commands string.
      */
-    @SuppressFBWarnings(value = "CC_CYCLOMATIC_COMPLEXITY", justification = "Working on it.")
+    @SuppressFBWarnings(value = "CC_CYCLOMATIC_COMPLEXITY",
+                        justification = "Working on it.")
     public void response(final String sender, final String cmds) {
         final String arrow = " --> ";
         if (StringUtils.isBlank(cmds)) {
             helpResponse(sender);
-        } else if (cmds.startsWith(Commands.VIEW_CMD)) {
-            if (bot.isOp(sender) && (Commands.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(cmds)) {
+        } else if (cmds.startsWith(View.VIEW_CMD)) {
+            if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(cmds)) {
                 if (!messages.isEmpty()) {
                     for (final TellMessage message : messages) {
                         bot.send(sender, Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                + " [ID: " + message.getId() + ", "
-                                + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
-                            true);
+                                         + " [ID: " + message.getId() + ", "
+                                         + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
+                                 true);
                     }
                 } else {
                     bot.send(sender, "There are no messages in the queue.", true);
@@ -170,20 +171,20 @@ public class Tell {
 
                         if (message.isReceived()) {
                             bot.send(sender,
-                                Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                    + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
-                                    + message.getId() + ", DELIVERED]",
-                                true);
+                                     Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
+                                     + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
+                                     + message.getId() + ", DELIVERED]",
+                                     true);
 
                         } else {
                             bot.send(sender,
-                                Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                    + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
-                                    + message.getId() + ", QUEUED]",
-                                true);
+                                     Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
+                                     + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
+                                     + message.getId() + ", QUEUED]",
+                                     true);
                         }
 
-                        bot.send(sender, bot.helpIndent(message.getMessage(), false), true);
+                        bot.send(sender, Utils.helpIndent(message.getMessage()), true);
                     }
                 }
 
@@ -192,10 +193,10 @@ public class Tell {
                 } else {
                     bot.send(sender, "To delete one or all delivered messages:");
                     bot.send(sender,
-                        bot.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
-                            + TELL_ALL_KEYWORD + '>'));
+                             Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
+                                              + TELL_ALL_KEYWORD + '>'));
                     bot.send(sender, "Messages are kept for " + Utils.bold(maxDays)
-                        + Utils.plural(maxDays, " day.", " days."));
+                                     + Utils.plural(maxDays, " day.", " days."));
                 }
             }
         } else if (cmds.startsWith(TELL_DEL_KEYWORD + ' ')) {
@@ -259,7 +260,7 @@ public class Tell {
                     save();
 
                     bot.send(sender, "Message [ID " + message.getId() + "] was queued for "
-                        + Utils.bold(message.getRecipient()), true);
+                                     + Utils.bold(message.getRecipient()), true);
                 } else {
                     bot.send(sender, "Sorry, the messages queue is currently full.", true);
                 }
@@ -289,43 +290,42 @@ public class Tell {
      */
     public void send(final String nickname, final boolean isMessage) {
         if (!nickname.equals(bot.getNick()) && isEnabled()) {
-            messages.stream().filter(message -> message.isMatch(nickname)).forEach(
-                message -> {
-                    if (message.getRecipient().equalsIgnoreCase(nickname) && !message.isReceived()) {
-                        if (message.getSender().equals(nickname)) {
-                            if (!isMessage) {
-                                bot.send(nickname, Utils.bold("You") + " wanted me to remind you: "
-                                        + Utils.reverseColor(message.getMessage()),
-                                    true);
-
-                                message.setIsReceived();
-                                message.setIsNotified();
-
-                                save();
-                            }
-                        } else {
-                            bot.send(nickname, message.getSender() + " wanted me to tell you: "
-                                    + Utils.reverseColor(message.getMessage()),
-                                true);
+            messages.stream().filter(message -> message.isMatch(nickname)).forEach(message -> {
+                if (message.getRecipient().equalsIgnoreCase(nickname) && !message.isReceived()) {
+                    if (message.getSender().equals(nickname)) {
+                        if (!isMessage) {
+                            bot.send(nickname, Utils.bold("You") + " wanted me to remind you: "
+                                               + Utils.reverseColor(message.getMessage()),
+                                     true);
 
                             message.setIsReceived();
+                            message.setIsNotified();
 
                             save();
                         }
-                    } else if (message.getSender().equalsIgnoreCase(nickname) && message.isReceived()
-                        && !message.isNotified()) {
-                        bot.send(nickname,
-                            "Your message "
-                                + Utils.reverseColor("[ID " + message.getId() + ']') + " was sent to "
-                                + Utils.bold(message.getRecipient()) + " on "
-                                + Utils.utcDateTime(message.getReceived()),
-                            true);
+                    } else {
+                        bot.send(nickname, message.getSender() + " wanted me to tell you: "
+                                           + Utils.reverseColor(message.getMessage()),
+                                 true);
 
-                        message.setIsNotified();
+                        message.setIsReceived();
 
                         save();
                     }
-                });
+                } else if (message.getSender().equalsIgnoreCase(nickname) && message.isReceived()
+                           && !message.isNotified()) {
+                    bot.send(nickname,
+                             "Your message "
+                             + Utils.reverseColor("[ID " + message.getId() + ']') + " was sent to "
+                             + Utils.bold(message.getRecipient()) + " on "
+                             + Utils.utcDateTime(message.getReceived()),
+                             true);
+
+                    message.setIsNotified();
+
+                    save();
+                }
+            });
         }
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/tell/TellMessage.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
similarity index 99%
rename from src/main/java/net/thauvin/erik/mobibot/tell/TellMessage.java
rename to src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
index 9d39e22..89dafab 100644
--- a/src/main/java/net/thauvin/erik/mobibot/tell/TellMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
@@ -30,7 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.tell;
+package net.thauvin.erik.mobibot.commands.tell;
 
 import java.io.Serializable;
 import java.time.Clock;
diff --git a/src/main/java/net/thauvin/erik/mobibot/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
similarity index 99%
rename from src/main/java/net/thauvin/erik/mobibot/tell/TellMessagesMgr.java
rename to src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
index ad6cb0a..c03af95 100644
--- a/src/main/java/net/thauvin/erik/mobibot/tell/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
@@ -30,7 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.tell;
+package net.thauvin.erik.mobibot.commands.tell;
 
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
index 636fbe4..f0485db 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
@@ -33,7 +33,6 @@
 package net.thauvin.erik.mobibot.entries;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Commands;
 import net.thauvin.erik.mobibot.Constants;
 import net.thauvin.erik.mobibot.Utils;
 
@@ -61,8 +60,8 @@ public final class EntriesUtils {
      * @return The entry's comment.
      */
     public static String buildComment(final int entryIndex, final int commentIndex, final EntryComment comment) {
-        return (Commands.LINK_CMD + (entryIndex + 1) + '.' + (commentIndex + 1) + ": [" + comment.getNick() + "] "
-            + comment.getComment());
+        return (Constants.LINK_CMD + (entryIndex + 1) + '.' + (commentIndex + 1) + ": [" + comment.getNick() + "] "
+                + comment.getComment());
     }
 
     /**
@@ -87,8 +86,8 @@ public final class EntriesUtils {
      */
     @SuppressFBWarnings(value = "CE_CLASS_ENVY", justification = "Yes, it does.")
     public static String buildLink(final int index, final EntryLink entry, final boolean isView) {
-        final StringBuilder buff = new StringBuilder().append(Commands.LINK_CMD).append(index + 1)
-            .append(": ").append('[').append(entry.getNick()).append(']');
+        final StringBuilder buff = new StringBuilder().append(Constants.LINK_CMD).append(index + 1)
+                                                      .append(": ").append('[').append(entry.getNick()).append(']');
 
         if (isView && entry.hasComments()) {
             buff.append("[+").append(entry.getCommentsCount()).append(']');
@@ -115,6 +114,6 @@ public final class EntriesUtils {
      * @return The entry's tags.
      */
     public static String buildTags(final int entryIndex, final EntryLink entry) {
-        return (Commands.LINK_CMD + (entryIndex + 1) + "T: " + entry.getPinboardTags().replace(",", ", "));
+        return (Constants.LINK_CMD + (entryIndex + 1) + "T: " + entry.getPinboardTags().replace(",", ", "));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
index 2d5409d..671db96 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
@@ -95,7 +95,7 @@ public abstract class AbstractModule {
     }
 
     /**
-     * Responds with the module's help.
+     * Responds with the module's Constants.
      *
      * @param bot       The bot's instance.
      * @param sender    The sender.
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
index 6d4a304..8201c8b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
@@ -35,10 +35,13 @@ package net.thauvin.erik.mobibot.modules;
 import net.objecthunter.exp4j.Expression;
 import net.objecthunter.exp4j.ExpressionBuilder;
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.text.DecimalFormat;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Calc module.
  *
@@ -88,7 +91,6 @@ public class Calc extends AbstractModule {
                                 final boolean isPrivate) {
         if (StringUtils.isNotBlank(args)) {
             bot.send(calc(args));
-
         } else {
             helpResponse(bot, sender, args, isPrivate);
         }
@@ -99,7 +101,7 @@ public class Calc extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To solve a mathematical calculation:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + CALC_CMD + " <calculation>"));
+        bot.send(sender, bold("To solve a mathematical calculation:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CALC_CMD + " <calculation>"));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
index a43f241..c66f968 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
@@ -56,6 +56,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The CurrentConverter module.
  *
@@ -228,14 +230,14 @@ public final class CurrencyConverter extends ThreadedModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To convert from one currency to another:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + CURRENCY_CMD + " [100 USD to EUR]"));
+        bot.send(sender, bold("To convert from one currency to another:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD + " [100 USD to EUR]"));
 
         if (args.endsWith(CURRENCY_CMD)) {
-            bot.send(sender, "For a listing of currency rates:");
-            bot.send(sender, bot.helpIndent(bot.getNick() + ": " + CURRENCY_CMD) + ' ' + CURRENCY_RATES_KEYWORD);
-            bot.send(sender, "For a listing of supported currencies:");
-            bot.send(sender, bot.helpIndent(bot.getNick() + ": " + CURRENCY_CMD));
+            bot.send(sender, bold("For a listing of currency rates:"));
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD) + ' ' + CURRENCY_RATES_KEYWORD);
+            bot.send(sender, bold("For a listing of supported currencies:"));
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD));
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
index 62b750c..4388724 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
@@ -37,6 +37,8 @@ import net.thauvin.erik.mobibot.Utils;
 
 import java.security.SecureRandom;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Dice module.
  *
@@ -72,15 +74,15 @@ public final class Dice extends AbstractModule {
         final int playerTotal = i + y;
 
         bot.send(bot.getChannel(),
-                 sender + " rolled two dice: " + Utils.bold(i) + " and " + Utils.bold(y) + " for a total of "
-                 + Utils.bold(playerTotal));
+                 sender + " rolled two dice: " + bold(i) + " and " + bold(y) + " for a total of "
+                 + bold(playerTotal));
 
         i = r.nextInt(6) + 1;
         y = r.nextInt(6) + 1;
         final int total = i + y;
 
         bot.action(
-                "rolled two dice: " + Utils.bold(i) + " and " + Utils.bold(y) + " for a total of " + Utils.bold(total));
+                "rolled two dice: " + bold(i) + " and " + bold(y) + " for a total of " + bold(total));
 
         if (playerTotal < total) {
             bot.action("wins.");
@@ -96,7 +98,7 @@ public final class Dice extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To roll the dice:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + DICE_CMD));
+        bot.send(sender, bold("To roll the dice:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + DICE_CMD));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
index e180fb5..f40b5af 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
@@ -52,6 +52,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The GoogleSearch module.
  *
@@ -79,14 +81,74 @@ public final class GoogleSearch extends ThreadedModule {
         properties.put(GOOGLE_CSE_KEY_PROP, "");
     }
 
+    /**
+     * Performs a search on Google.
+     *
+     * @param query  The search query.
+     * @param apiKey The Google API key.
+     * @param cseKey The Google CSE key.
+     * @return The {@link Message} array containing the search results.
+     * @throws ModuleException If an error occurs while searching.
+     */
+    @SuppressFBWarnings({ "URLCONNECTION_SSRF_FD", "REC_CATCH_EXCEPTION" })
+    @SuppressWarnings(("PMD.AvoidInstantiatingObjectsInLoops"))
+    static List<Message> searchGoogle(final String query, final String apiKey, final String cseKey)
+            throws ModuleException {
+        if (StringUtils.isBlank(apiKey) || StringUtils.isBlank(cseKey)) {
+            throw new ModuleException(StringUtils.capitalize(GOOGLE_CMD) + " is disabled. The API keys are missing.");
+        }
+
+        if (StringUtils.isNotBlank(query)) {
+            final ArrayList<Message> results = new ArrayList<>();
+            try {
+                final String q = URLEncoder.encode(query, StandardCharsets.UTF_8.toString());
+
+                final URL url =
+                        new URL("https://www.googleapis.com/customsearch/v1?key="
+                                + apiKey
+                                + "&cx="
+                                + cseKey
+                                + "&q="
+                                + q
+                                + "&filter=1&num=5&alt=json");
+                final URLConnection conn = url.openConnection();
+
+                final StringBuilder sb = new StringBuilder();
+                try (final BufferedReader reader =
+                             new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        sb.append(line);
+                    }
+
+                    final JSONObject json = new JSONObject(sb.toString());
+                    final JSONArray ja = json.getJSONArray("items");
+
+                    for (int i = 0; i < ja.length(); i++) {
+                        final JSONObject j = ja.getJSONObject(i);
+                        results.add(new NoticeMessage(Utils.unescapeXml(j.getString("title"))));
+                        results.add(
+                                new NoticeMessage(TAB_INDENT + j.getString("link"), Colors.DARK_GREEN));
+                    }
+                }
+            } catch (IOException e) {
+                throw new ModuleException("searchGoogle(" + query + ')', "An error has occurred searching Google.", e);
+            }
+
+            return results;
+        } else {
+            throw new ModuleException("Invalid query.");
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
         if (isEnabled()) {
-            bot.send(sender, "To search Google:");
-            bot.send(sender, bot.helpIndent(bot.getNick() + ": " + GOOGLE_CMD + " <query>"));
+            bot.send(sender, bold("To search Google:"));
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + GOOGLE_CMD + " <query>"));
         } else {
             bot.send(sender, "The Google search module is disabled.");
         }
@@ -100,7 +162,7 @@ public final class GoogleSearch extends ThreadedModule {
         if (StringUtils.isNotBlank(query)) {
             try {
                 final List<Message> results = searchGoogle(query, properties.get(GOOGLE_API_KEY_PROP),
-                    properties.get(GOOGLE_CSE_KEY_PROP));
+                                                           properties.get(GOOGLE_CSE_KEY_PROP));
                 for (final Message msg : results) {
                     bot.send(sender, msg);
                 }
@@ -112,64 +174,4 @@ public final class GoogleSearch extends ThreadedModule {
             helpResponse(bot, sender, query, true);
         }
     }
-
-    /**
-     * Performs a search on Google.
-     *
-     * @param query  The search query.
-     * @param apiKey The Google API key.
-     * @param cseKey The Google CSE key.
-     * @return The {@link Message} array containing the search results.
-     * @throws ModuleException If an error occurs while searching.
-     */
-    @SuppressFBWarnings({"URLCONNECTION_SSRF_FD", "REC_CATCH_EXCEPTION"})
-    @SuppressWarnings(("PMD.AvoidInstantiatingObjectsInLoops"))
-    static List<Message> searchGoogle(final String query, final String apiKey, final String cseKey)
-        throws ModuleException {
-        if (StringUtils.isBlank(apiKey) || StringUtils.isBlank(cseKey)) {
-            throw new ModuleException(StringUtils.capitalize(GOOGLE_CMD) + " is disabled. The API keys are missing.");
-        }
-
-        if (StringUtils.isNotBlank(query)) {
-            final ArrayList<Message> results = new ArrayList<>();
-            try {
-                final String q = URLEncoder.encode(query, StandardCharsets.UTF_8.toString());
-
-                final URL url =
-                    new URL("https://www.googleapis.com/customsearch/v1?key="
-                        + apiKey
-                        + "&cx="
-                        + cseKey
-                        + "&q="
-                        + q
-                        + "&filter=1&num=5&alt=json");
-                final URLConnection conn = url.openConnection();
-
-                final StringBuilder sb = new StringBuilder();
-                try (final BufferedReader reader =
-                         new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        sb.append(line);
-                    }
-
-                    final JSONObject json = new JSONObject(sb.toString());
-                    final JSONArray ja = json.getJSONArray("items");
-
-                    for (int i = 0; i < ja.length(); i++) {
-                        final JSONObject j = ja.getJSONObject(i);
-                        results.add(new NoticeMessage(Utils.unescapeXml(j.getString("title"))));
-                        results.add(
-                            new NoticeMessage(TAB_INDENT + j.getString("link"), Colors.DARK_GREEN));
-                    }
-                }
-            } catch (IOException e) {
-                throw new ModuleException("searchGoogle(" + query + ')', "An error has occurred searching Google.", e);
-            }
-
-            return results;
-        } else {
-            throw new ModuleException("Invalid query.");
-        }
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
index 2210baf..199e4e7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
@@ -44,6 +44,8 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Joke module.
  *
@@ -126,7 +128,7 @@ public final class Joke extends ThreadedModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To retrieve a random joke:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + JOKE_CMD));
+        bot.send(sender, bold("To retrieve a random joke:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + JOKE_CMD));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
index a3b808f..676ebbe 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
@@ -34,12 +34,15 @@ package net.thauvin.erik.mobibot.modules;
 
 import net.thauvin.erik.mobibot.Constants;
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import org.apache.commons.net.whois.WhoisClient;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Lookup module.
  *
@@ -195,7 +198,7 @@ public final class Lookup extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To perform a DNS lookup query:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + LOOKUP_CMD + " <ip address or hostname>"));
+        bot.send(sender, bold("To perform a DNS lookup query:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + LOOKUP_CMD + " <ip address or hostname>"));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
index 214a1ed..4e689a8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
@@ -33,11 +33,14 @@
 package net.thauvin.erik.mobibot.modules;
 
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.List;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Ping module.
  *
@@ -94,7 +97,7 @@ public class Ping extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To ping the bot:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + PING_CMD));
+        bot.send(sender, bold("To ping the bot:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + PING_CMD));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 903bf90..a3de8e5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -33,7 +33,10 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.green
+import net.thauvin.erik.mobibot.Utils.helpIndent
+import net.thauvin.erik.mobibot.Utils.red
 import kotlin.random.Random
 
 
@@ -71,7 +74,7 @@ class RockPaperScissors : AbstractModule() {
 
     companion object {
         // For testing.
-        fun winLoseOrDraw(player: String, bot: String ): String {
+        fun winLoseOrDraw(player: String, bot: String): String {
             val hand = Hands.valueOf(player.toUpperCase())
             val botHand = Hands.valueOf(bot.toUpperCase())
 
@@ -88,26 +91,26 @@ class RockPaperScissors : AbstractModule() {
         val botHand = Hands.values()[Random.nextInt(0, Hands.values().size)]
         when {
             hand == botHand -> {
-                bot.action("${Utils.green(hand.name)} vs. ${Utils.green(botHand.name)} ~ The game is tied ~")
+                bot.action("${green(hand.name)} vs. ${green(botHand.name)} ~ The game is tied ~")
             }
             hand.beats(botHand) -> {
                 bot.action(
-                    "${Utils.green(hand.name)} ${Utils.bold(hand.action)} ${Utils.red(botHand.name)} ~ You win ~"
+                    "${green(hand.name)} ${bold(hand.action)} ${red(botHand.name)} ~ You win ~"
                 )
             }
             else -> {
                 bot.action(
-                    "${Utils.green(botHand.name)} ${Utils.bold(botHand.action)} ${Utils.red(botHand.name)} ~ You lose ~"
+                    "${green(botHand.name)} ${bold(botHand.action)} ${red(botHand.name)} ~ You lose ~"
                 )
             }
         }
     }
 
     override fun helpResponse(bot: Mobibot, sender: String, args: String?, isPrivate: Boolean) {
-        bot.send(sender, "To play Rock Paper Scissors:")
+        bot.send(sender, bold("To play Rock Paper Scissors:"))
         bot.send(
             sender,
-            bot.helpIndent(
+            helpIndent(
                 "${bot.nick}: ${Hands.ROCK.name.toLowerCase()} or ${Hands.PAPER.name.toLowerCase()}"
                     + " or ${Hands.SCISSORS.name.toLowerCase()}"
             )
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
index 42c5057..72e1517 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
@@ -52,6 +52,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The StockQuote module.
  *
@@ -82,9 +84,10 @@ public final class StockQuote extends ThreadedModule {
         properties.put(ALPHAVANTAGE_API_KEY_PROP, "");
     }
 
-    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE", justification = "false positive?")
+    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
+                        justification = "false positive?")
     private static JSONObject getJsonResponse(final Response response, final String debugMessage)
-        throws IOException, ModuleException {
+            throws IOException, ModuleException {
         if (response.isSuccessful()) {
             if (response.body() != null) {
                 final JSONObject json = new JSONObject(Objects.requireNonNull(response.body()).string());
@@ -132,7 +135,7 @@ public final class StockQuote extends ThreadedModule {
      * @return The {@link Message} array containing the stock quote.
      * @throws ModuleException If an errors occurs.
      */
-    @SuppressWarnings({"PMD.CloseResource"})
+    @SuppressWarnings({ "PMD.CloseResource" })
     static List<Message> getQuote(final String symbol, final String apiKey) throws ModuleException {
         if (StringUtils.isBlank(apiKey)) {
             throw new ModuleException(StringUtils.capitalize(STOCK_CMD) + " is disabled. The API key is missing.");
@@ -146,7 +149,7 @@ public final class StockQuote extends ThreadedModule {
             try {
                 // Search for symbol/keywords
                 Request request = new Request.Builder().url(
-                    ALAPHAVANTAGE_URL + "SYMBOL_SEARCH&keywords=" + symbol + "&apikey=" + apiKey).build();
+                        ALAPHAVANTAGE_URL + "SYMBOL_SEARCH&keywords=" + symbol + "&apikey=" + apiKey).build();
                 Response response = client.newCall(request).execute();
 
                 JSONObject json = getJsonResponse(response, debugMessage);
@@ -161,8 +164,8 @@ public final class StockQuote extends ThreadedModule {
 
                 // Get quote for symbol
                 request = new Request.Builder().url(
-                    ALAPHAVANTAGE_URL + "GLOBAL_QUOTE&symbol=" + symbolInfo.getString("1. symbol") + "&apikey="
-                    + apiKey).build();
+                        ALAPHAVANTAGE_URL + "GLOBAL_QUOTE&symbol=" + symbolInfo.getString("1. symbol") + "&apikey="
+                        + apiKey).build();
                 response = client.newCall(request).execute();
 
                 json = getJsonResponse(response, debugMessage);
@@ -175,20 +178,21 @@ public final class StockQuote extends ThreadedModule {
                 }
 
                 messages.add(new PublicMessage(
-                    "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol")) + " [" + Utils
-                        .unescapeXml(symbolInfo.getString("2. name") + ']')));
+                        "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol")) + " [" + Utils.unescapeXml(
+                                symbolInfo.getString("2. name") + ']')));
                 messages.add(new PublicMessage("    Price:     " + Utils.unescapeXml(quote.getString("05. price"))));
-                messages.add(
-                    new PublicMessage("    Previous:  " + Utils.unescapeXml(quote.getString("08. previous close"))));
+                messages.add(new PublicMessage(
+                        "    Previous:  "
+                        + Utils.unescapeXml(quote.getString("08. previous close"))));
                 messages.add(new NoticeMessage("    Open:      " + Utils.unescapeXml(quote.getString("02. open"))));
                 messages.add(new NoticeMessage("    High:      " + Utils.unescapeXml(quote.getString("03. high"))));
                 messages.add(new NoticeMessage("    Low:       " + Utils.unescapeXml(quote.getString("04. low"))));
                 messages.add(new NoticeMessage("    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))));
                 messages.add(new NoticeMessage(
-                    "    Latest:    " + Utils.unescapeXml(quote.getString("07. latest trading day"))));
+                        "    Latest:    " + Utils.unescapeXml(quote.getString("07. latest trading day"))));
                 messages.add(new NoticeMessage(
-                    "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " [" + Utils
-                        .unescapeXml(quote.getString("10. change percent")) + ']'));
+                        "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " [" + Utils.unescapeXml(
+                                quote.getString("10. change percent")) + ']'));
             } catch (IOException | NullPointerException e) {
                 throw new ModuleException(debugMessage, "An error has occurred retrieving a stock quote.", e);
             }
@@ -203,8 +207,8 @@ public final class StockQuote extends ThreadedModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To retrieve a stock quote:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + STOCK_CMD + " <symbol|keywords>"));
+        bot.send(sender, bold("To retrieve a stock quote:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + STOCK_CMD + " <symbol|keywords>"));
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index 1b7af6e..f3ed606 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -33,6 +33,7 @@
 package net.thauvin.erik.mobibot.modules;
 
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.NoticeMessage;
 import twitter4j.DirectMessage;
@@ -40,6 +41,8 @@ import twitter4j.Status;
 import twitter4j.TwitterFactory;
 import twitter4j.conf.ConfigurationBuilder;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Twitter module.
  *
@@ -115,8 +118,8 @@ public final class Twitter extends ThreadedModule {
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
         if (isEnabled()) {
-            bot.send(sender, "To post to Twitter:");
-            bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TWITTER_CMD + " <message>"));
+            bot.send(sender, bold("To post to Twitter:"));
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TWITTER_CMD + " <message>"));
         } else {
             bot.send(sender, "The Twitter posting facility is disabled.");
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 115e6ef..9d6087e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -37,6 +37,8 @@ import net.thauvin.erik.mobibot.Utils;
 
 import java.security.SecureRandom;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The War module.
  *
@@ -80,14 +82,14 @@ public final class War extends AbstractModule {
             y = r.nextInt(WAR_DECK.length);
 
             bot.send(bot.getChannel(),
-                     sender + " drew the " + Utils.bold(WAR_DECK[i]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
-            bot.action("drew the " + Utils.bold(WAR_DECK[y]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
+                     sender + " drew the " + bold(WAR_DECK[i]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
+            bot.action("drew the " + bold(WAR_DECK[y]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
 
             if (i != y) {
                 break;
             }
 
-            bot.send("This means " + Utils.bold("WAR") + '!');
+            bot.send("This means " + bold("WAR") + '!');
         }
 
         if (i < y) {
@@ -102,7 +104,7 @@ public final class War extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To play war:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + WAR_CMD));
+        bot.send(sender, bold("To play war:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WAR_CMD));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
index 5f1a376..53822e1 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
@@ -52,6 +52,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The <code>Weather2</code> module.
  *
@@ -177,7 +179,7 @@ public class Weather2 extends ThreadedModule {
                                                                Colors.GREEN));
                             } else {
                                 final HttpUrl url = Objects.requireNonNull(HttpUrl.parse(
-                                    "https://openweathermap.org/find"))
+                                        "https://openweathermap.org/find"))
                                                            .newBuilder()
                                                            .addQueryParameter("q",
                                                                               city + ',' + country)
@@ -199,17 +201,22 @@ public class Weather2 extends ThreadedModule {
         return messages;
     }
 
+    private static String wind(final Double w) {
+        final double kmh = w * 1.60934;
+        return Math.round(w) + " mph, " + Math.round(kmh) + " km/h";
+    }
+
     /**
      * {@inheritDoc}
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To display weather information:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " <city> [, <country code>]"));
+        bot.send(sender, bold("To display weather information:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " <city> [, <country code>]"));
         bot.send(sender, "For example:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " paris, fr"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " paris, fr"));
         bot.send(sender,
-                 "The default ISO 3166 country code is " + Utils.bold("US")
+                 "The default ISO 3166 country code is " + bold("US")
                  + ". Zip codes are supported in most countries.");
     }
 
@@ -236,9 +243,4 @@ public class Weather2 extends ThreadedModule {
             helpResponse(bot, sender, args, true);
         }
     }
-
-    private static String wind(final Double w) {
-        final double kmh = w * 1.60934;
-        return Math.round(w) + " mph, " + Math.round(kmh) + " km/h";
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index 7bbc09d..a19f33e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -35,6 +35,7 @@ package net.thauvin.erik.mobibot.modules;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.thauvin.erik.mobibot.Constants;
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import net.thauvin.erik.mobibot.msg.ErrorMessage;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.PublicMessage;
@@ -47,6 +48,8 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The WorldTime module.
  *
@@ -232,11 +235,11 @@ public final class WorldTime extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To display a country's current date/time:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TIME_CMD) + " [<country code>]");
+        bot.send(sender, bold("To display a country's current date/time:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD) + " [<country code>]");
 
-        bot.send(sender, "For a listing of the supported countries:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TIME_CMD));
+        bot.send(sender, bold("For a listing of the supported countries:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD));
     }
 
     /**
diff --git a/src/test/java/net/thauvin/erik/mobibot/tell/TellMessageTest.java b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
similarity index 98%
rename from src/test/java/net/thauvin/erik/mobibot/tell/TellMessageTest.java
rename to src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
index 04927a8..e57c52a 100644
--- a/src/test/java/net/thauvin/erik/mobibot/tell/TellMessageTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
@@ -30,7 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.tell;
+package net.thauvin.erik.mobibot.commands.tell;
 
 import org.testng.annotations.Test;
 
diff --git a/version.properties b/version.properties
index aa42206..30605d4 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Mar 23 23:04:40 PDT 2020
-version.buildmeta=714
+#Sat Mar 28 10:22:37 PDT 2020
+version.buildmeta=045
 version.major=0
-version.minor=7
-version.patch=3
-version.prerelease=beta
+version.minor=8
+version.patch=0
+version.prerelease=alpha
 version.project=mobibot
-version.semver=0.7.3-beta+714
+version.semver=0.8.0-alpha+045