Made more changes. Design still needs to be finalized.