Fixed errors, partially working!