Added some code that needs to be redesigned.