Added base code, needs ant rework