made this somewhat usable