finished some stuff awhile back