eh, more working... sort of