first commit in a long time...app crashes btw