diff --git a/README.md b/README.md
index 5ebee32..a932302 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ The most recent stable build for Windows can be found [here](https://dl.dropboxu
 
 The current version of Tortuga is released under the [zlib license](http://en.wikipedia.org/wiki/Zlib_License).  
 
-Copyright (c) 2013, 2014 Kayne Ruse
+Copyright (c) 2013-2015 Kayne Ruse
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff --git a/copyright.txt b/copyright.txt
index 08613f0..964147d 100644
--- a/copyright.txt
+++ b/copyright.txt
@@ -2,7 +2,7 @@ Future versions (to be determined) may be released under a modified version of t
 
 The current version of Tortuga is released under the zlib license.
 
-Copyright (c) 2013, 2014 Kayne Ruse
+Copyright (c) 2013-2015 Kayne Ruse
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff --git a/todo.txt b/todo.txt
index 7fd4030..c543542 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,31 +1,20 @@
-TODO: Account system needs salts & hashes for security
-TODO: Character system might need an API
-TODO: Door system needs an API
-TODO: monster system needs an API
+TODO: In need of script APIs (list)
+	* Characters
+	* Monsters
+	* Doors
+	* Waypoints
 
-TODO: rewrite the main body of the server
-TODO: I need a better way to handle the statistics
+TODO: Account passwords (list)
+	* backbone account server OR
+	* social network login OR
+	* ...
+	* salts & hashes
+
+TODO: Waypoints, with positions and trigger zones (collision areas) for doors, monster spawns, etc.
 TODO: Fix shoddy movement
-TODO: Handle statistics server-side
 TODO: Periodic mass server saves
-TODO: join vs login
-
 TODO: Remove the big "Shut Down" button
 TODO: Make a way for the server owner to control the server directly
 TODO: The TileSheet class should implement the surface itself
-TODO: Passwords/Authentication
 TODO: Time delay for requesting region packets
 TODO: A proper logging system
-
--------------------------
-
-The entities might need an API, which interfaces with all entity types (characters, monsters, doors, etc.)
-The Entity base class handles position (including room) and motion, so something generic like this could be used (or aliased by other APIs)
-
-entity:
-	
--------------------------
-
-Lobby:
-	JOIN_REQUEST -> JOIN_RESPONSE, JOIN_REJECTION
-	LOGIN_REQUEST -> LOGIN_RESPONSE, LOGIN_REJECTION
\ No newline at end of file