Debugged and renamed initial implentation while adding a demo.