Comming some basic changes to the example program..

Everything in here seems to work.