The stuff now works.. need to clean up code now