bugs to fix, but hacked for push