still need to add a few more stuff until i'm satisfied

329