Added example class, made some tweaks