Still buggy but being released as is while I don't have time to work on it

Signed-off-by: Graham Chiu <compkarori@gmail.com>