added calculations...needs work