Fixed bug in adding twice in zero-sized list. Removed hardcode from main class.