First step for #63

Signed-off-by: Suki <suki@missallsunday.com>
More stuff for #63

Signed-off-by: Suki <suki@missallsunday.com>