INternal - Code cleanup and now getting everything to save to the database correctly.