Finished up initial design