Should be done, let me know what you think