Got this stuff working for the time being

Signed-off-by: Cade <me@cade.jp>