I think it might have base functionality working now