hooked up but with some minor bugs