Finished integrating me and lee's work