still updating.. bears with me ..
final commit i swear