Moved Methods Around for Future