Basic logic finished, animation bug fix pending