Added Documentation, TODO