13w17a Changes and started for 13w18a

Signed-off-by: William Lebel <lebelwilliam@gmail.com>