initial extended results

initial extended results
minor restructure