Refactored and finished ABM-255