Finishing up remaining basic code framework.