Implemented Dynamic additions, now fix bugs