Iland modification and rewriting

Signed-off-by: Ed J <edj@src.gnome.org>