General Design Development

Add commenting and code cleanups