Removed warnings
Started adding serializable