Item 43 efforts(Not Complete, needs a bit refactoring before completinh)