Added the incomplete implementaton from previous work. Bugs to be submitted