Methods sorted out and extremely close to finished