Somewhat working

Not pretty though.