Implimenting Save Entries

cleaned up code a bit too.