added buncha stuff yo