Started implementing changes from first build.