fixed everything, basic functionality done