Class implemented; better code & more features