Further functionality added!

Just incremental additions throughout.