some bugs but making progress