Finished coding for first release