Changed it to int-based. Removed comments. GOing to add now.